diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 0521527..befc2ae 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -12,8 +12,8 @@ general { # BACKGROUND background { monitor = - path = $HOME/Pictures/mandelbrot.png - blur_passes = 0 + path = $HOME/Pictures/reze/reze.png + blur_passes = 2 color = $base } diff --git a/hypr/modules/keybinds.conf b/hypr/modules/keybinds.conf index d836c5a..6bac9e0 100644 --- a/hypr/modules/keybinds.conf +++ b/hypr/modules/keybinds.conf @@ -77,10 +77,10 @@ bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow # Laptop multimedia keys for volume and LCD brightness -bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+ -bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%- -bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle +bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+ && pkill -RTMIN+9 waybar +bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%- && pkill -RTMIN+9 waybar +bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && pkill -RTMIN+9 waybar +bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle && pkill -RTMIN+9 waybar bindel = ,XF86MonBrightnessUp, exec, brightnessctl set 5%+ bindel = ,XF86MonBrightnessDown, exec, brightnessctl set 5%- diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 8910815..837fcda 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -4,7 +4,7 @@ "name": "top", "layer": "top", "position": "top", - "height": 34, + "height": 39, "spacing": 4, "margin-top": 6, "margin-left": 10, @@ -46,8 +46,9 @@ "format": "{}", "return-type": "json", "exec": "fluxo-rs game", - "on-click": "~/.config/hypr/scripts/gamemode.sh & disown", - "interval": 1 + "on-click": "~/.config/hypr/scripts/gamemode.sh && pkill -RTMIN+1 waybar & disown", + "signal": 1, + "interval": 5 }, // --- Fluxo-rs Power --- @@ -63,23 +64,24 @@ "name": "bottom", "layer": "top", "position": "bottom", - "height": 34, + "height": 35, "spacing": 4, "margin-bottom": 6, "margin-left": 10, "margin-right": 10, "modules-left": [ - "custom/sys", - "group/hardware", // Replaced individual modules with a group - "custom/disk-root" + "group/hardware" // Replaced individual modules with a group ], // Add the group definition anywhere in the bottom bar block: "group/hardware": { "orientation": "horizontal", "modules": [ + "custom/sys", "custom/cpu", + "custom/gpu", "custom/mem", + "custom/disk-root", "custom/network" ] }, @@ -111,6 +113,12 @@ "exec": "fluxo-rs mem", "interval": 3 }, + "custom/gpu": { + "format": "{}", + "return-type": "json", + "exec": "fluxo-rs gpu", + "interval": 3 + }, "custom/network": { "format": "{}", "return-type": "json", @@ -131,42 +139,38 @@ "format": "{}", "return-type": "json", "exec": "fluxo-rs vol", - "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle", - "on-scroll-up": "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+", - "on-scroll-down": "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%-", - "on-click-right": "fluxo-rs vol --cycle", + "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && pkill -RTMIN+8 waybar", + "on-scroll-up": "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+ && pkill -RTMIN+8 waybar", + "on-scroll-down": "wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%- && pkill -RTMIN+8 waybar", + "on-click-right": "fluxo-rs vol --cycle && pkill -RTMIN+8 waybar", "on-click-middle": "pavucontrol", - "interval": 1 + "signal": 8, + "interval": 5 }, "custom/mic": { "format": "{}", "return-type": "json", "exec": "fluxo-rs mic", - "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle", - "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+", - "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-", - "on-click-right": "fluxo-rs mic --cycle", + "on-click": "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle && pkill -RTMIN+9 waybar", + "on-scroll-up": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+ && pkill -RTMIN+9 waybar", + "on-scroll-down": "wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%- && pkill -RTMIN+9 waybar", + "on-click-right": "fluxo-rs mic --cycle && pkill -RTMIN+9 waybar", "on-click-middle": "pavucontrol", - "interval": 1 + "signal": 9, + "interval": 5 }, "custom/bluetooth-audio": { "format": "{}", "return-type": "json", "exec": "fluxo-rs bt", - "on-click": "fluxo-rs bt menu", - "on-click-right": "fluxo-rs bt cycle_mode", + "on-click": "fluxo-rs bt menu && pkill -RTMIN+10 waybar", + "on-click-right": "fluxo-rs bt cycle_mode && pkill -RTMIN+10 waybar", + "signal": 10, "interval": 5, "tooltip": true } // --- Commented Out Modules --- /* - "custom/gpu": { - "format": "{}", - "return-type": "json", - "exec": "fluxo-rs gpu", - "on-click": "lact gui & disown", - "interval": 3 - }, "custom/btrfs": { "format": "{}", "return-type": "json", diff --git a/waybar/style.css b/waybar/style.css index 655c80d..5d3e302 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -31,9 +31,7 @@ window#waybar.bottom { #workspaces, #window, #tray, -#custom-sys, #hardware, -#custom-disk-root, #custom-bluetooth-audio, #custom-volume, #custom-buds, @@ -122,7 +120,10 @@ window#waybar.bottom { /* Strip backgrounds and borders from the items inside the group */ #custom-cpu, #custom-mem, -#custom-network { +#custom-network +#custom-sys, +#custom-gpu, +#custom-disk-root { background-color: transparent; border: none; box-shadow: none; @@ -132,14 +133,23 @@ window#waybar.bottom { /* Subtle vertical separator line between them */ #custom-cpu, -#custom-mem { +#custom-mem, +#custom-sys, +#custom-gpu, +#custom-disk-root { border-right: 1px solid alpha(@surface1, 0.5); border-radius: 0; } +#custom-network { + padding-left: 8px; + color: @mauve; +} + /* Hardware Semantic Alerts */ -#custom-cpu.high, #custom-mem.high { color: @peach; } -#custom-cpu.max, #custom-mem.max { color: @red; } +.normal { color: @mauve; } +.high { color: @peach; } +.max { color: @red; } /* --- Center Bottom Utilities --- */ #custom-gamemode.active {