lotofupdates

naibaf0 · Feb 17, 2024 · b139a1d · b139a1d
1 parent 512a5a2
commit b139a1d
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 30 deletions.
diff --git a/config/hypr/banshee.conf b/config/hypr/banshee.conf
@@ -12,24 +12,25 @@ device:asue140a:00-04f3:3134-touchpad {
     # scroll_factor = 0.4
 }
 
+bindl=,switch:Lid Switch,exec,systemctl suspend
 bindr = $mainMod, super_l, exec, pkill -USR1 waybar
 exec = kanshictl reload # apply current kanshi setup when saved
 exec-once = $scriptsDir/battery-notif.sh
 exec-once = kanshi &
 
+general {
+    gaps_in = 3
+    gaps_out = 0
+}
+
 decoration {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-    rounding = 10
+    rounding = 0
 
     blur {
         enabled = false
-        size = 3
-        passes = 1
     }
 
     drop_shadow = false
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
 }
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
@@ -6,6 +6,7 @@ $localBin = $HOME/.bin
 $scriptsDir = $HOME/.dotfiles/scripts
 $bgDir = $HOME/Pictures/4k\ Wallpapers
 $hyprDir = $HOME/.config/hypr
+$hostConfig = $HOME/.config/hypr/$USER
 
 # Wofi
 $menu = wofi -i --show drun | xargs hyprctl dispatch exec --
@@ -27,8 +28,8 @@ $editor = nvim
 # $keyringgui = seahorse
 #
 # Source a file (multi-file configs)
-source=~/.config/hypr/macchiato.conf
-source=~/.config/hypr/host.conf
+source=$hyprDir/macchiato.conf
+source=$hostConfig
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
@@ -96,11 +97,11 @@ device:logitech-g305-1 {
 general {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-    gaps_in = 3
-    gaps_out = 6
+    # gaps_in = 3
+    # gaps_out = 6
     border_size = 2
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.inactive_border = rgba(595959aa)
+    col.active_border = $lavender $rosewater 45deg
+    col.inactive_border = $surface2
 
     layout = dwindle
 }
@@ -140,12 +141,16 @@ master {
 }
 
 group {
+    col.border_active = $lavender $rosewater 45deg
+    col.border_inactive = $surface2
+    # col.border_locked_active = $lavender $rosewater 45deg
+    # col.border_locked_inactive = $surface2
     groupbar {
-        font_family = Overpass
+        font_family = Overpass Bold
         font_size = 10
-        text_color = $text
-        col.active = $surface0
-        col.inactive = $surface2
+        text_color = $base
+        col.active = $lavender
+        col.inactive = $overlay2
     }
 }
 
@@ -173,6 +178,8 @@ windowrule = float, title:branchdialog
 windowrule = float, Lxappearance
 windowrule = float, qalculate-gtk
 windowrule = float, blueman-manager
+windowrule = float, wdisplays
+windowrule = pin, wdisplays
 windowrule = float, title:^(Media viewer)$
 windowrule = float, title:^(Volume Control)$
 

diff --git a/config/hypr/sunnydale.conf b/config/hypr/sunnydale.conf
@@ -3,6 +3,11 @@
 # monitor=,preferred,auto,auto
 monitor=DP-1, 2560x1440@143.973Hz, auto, auto, vrr,0
 
+general {
+    gaps_in = 3
+    gaps_out = 6
+}
+
 decoration {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 

diff --git a/config/waybar/config b/config/waybar/config
@@ -1,32 +1,32 @@
 [{
     "name": "desktop",
-    "id": 0,
     "ipc": false,
     "output": "!eDP-1",
     "layer": "top", // Waybar at top layer
+    //"mode": "dock", // needs to be unset, otherwise tooltips are behind windows https://github.com/Alexays/Waybar/issues/1745
     // "position": "bottom", // Waybar position (top|bottom|left|right)
     //"height": 35, // Waybar height (to be removed for auto )
     // "width": 1280, // Waybar width
-    "margin": "6, 6, 0",
     "padding": 0,
     //"spacing": 10,
     "modules-left": ["hyprland/workspaces", "hyprland/submap"],
     "modules-center": ["hyprland/window"],
     "modules-right": ["gamemode", "custom/scratchpad", "custom/updates", "custom/clipboard", "idle_inhibitor", "pulseaudio", "bluetooth", "network", "battery", "cpu", "memory", "temperature#sunnydale", "temperature#banshee", "custom/weather", "clock"],
-    "include": ["$HOME/.config/waybar/defaults.json"]
+    "include": ["$HOME/.config/waybar/defaults.json", "$HOME/.config/waybar/host"]
 }, {
     "name": "mobile",
     "id": 2,
     "ipc": false,
     "output": "eDP-1",
-    "layer": "overlay", // Waybar at top layer
+    "layer": "top", // Waybar at top layer
+    "mode": "hide",
+    "start_hidden": true,
     // "position": "bottom", // Waybar position (top|bottom|left|right)
     //"height": 35, // Waybar height (to be removed for auto )
     // "width": 1280, // Waybar width
     //"margin": "0, 0, 0",
     "padding": 0,
     //"spacing": 10,
-    "mode": "hide",
     "modules-left": ["hyprland/workspaces", "hyprland/submap"],
     "modules-center": ["hyprland/window"],
     "modules-right": ["custom/scratchpad", "custom/updates", "custom/clipboard", "idle_inhibitor", "pulseaudio", "bluetooth", "network", "battery", "custom/weather", "clock"],

diff --git a/config/waybar/host b/config/waybar/host
@@ -0,0 +1 @@
+/home/naibafo/.config/waybar/hosts/banshee
diff --git a/config/waybar/hosts/Sunnydale b/config/waybar/hosts/Sunnydale
@@ -0,0 +1,3 @@
+{
+    "margin": "6, 6, 0",
+}
diff --git a/config/waybar/hosts/banshee b/config/waybar/hosts/banshee
@@ -0,0 +1,3 @@
+{
+    "margin": "6, 6, 6",
+}
diff --git a/config/waybar/style.css b/config/waybar/style.css
@@ -7,28 +7,24 @@
 @import "/home/naibafo/.dotfiles/themes/catppuccin-macchiato.css";
 
 window#waybar.desktop {
-    background: alpha(@theme_base_color, 0.9);
-    /* border-bottom: 2px solid @unfocused_borders; */
-    color: @theme_text_color;
+    background: alpha(@base, 0.9);
     /* background-color: alpha(@mantle, 0.95); */
     /* border: 1px solid #b45bcf; */
     border-radius: 10px;
     /* border: 2px solid rgba(100, 114, 125, 0.5); */
-    border: 2px solid shade(@lavender, 0.4);
-    /* color: @text; */
+    border: 2px solid shade(@lavender, 0.6);
+    color: @text;
     transition-property: background-color;
     transition-duration: .5s;
 }
 window#waybar.mobile {
-    background: alpha(@theme_base_color, 0.95);
-    /* border-bottom: 2px solid @unfocused_borders; */
-    color: @theme_text_color;
+    background: alpha(@base, 0.95);
     /* background-color: alpha(@mantle, 0.95); */
     /* border: 1px solid #b45bcf; */
     /* border-radius: 10px; */
     /* border: 2px solid rgba(100, 114, 125, 0.5); */
     border: 2px solid shade(@lavender, 0.4);
-    /* color: @text; */
+    color: @text;
     transition-property: background-color;
     transition-duration: .5s;
 }
@@ -50,6 +46,15 @@ window#waybar.kitty {
     /* background-color: @mantle; */
 }
 
+tooltip {
+    background: alpha(@base, 0.9);
+  /* background: alpha(@overlay0, 0.8); */
+  border: 1px solid alpha(@mantle, 0.5);
+}
+tooltip label {
+  color: white;
+}
+
 
     /* #workspaces */
     /* #workspaces button */