updated waybar + fluxo

hypr/hyprpaper.conf

@@ -1,6 +1,6 @@
 wallpaper {
 	monitor =
-	path = ~/Pictures/reze/reze.png
+	path = ~/Pictures/rem/rem-oled.png
 	fit_mode = cover
 }
 

waybar/config.jsonc

@@ -11,16 +11,13 @@
         "margin-right": 10,
 
         "modules-left": [
-            "hyprland/workspaces",
+            "group/spaces"
-            "hyprland/window"
         ],
         "modules-center": [
             "group/center"
         ],
         "modules-right": [
-            "tray",
+            "group/powertray"
-            "custom/gamemode",
-            "custom/power_status"
         ],
 
         // --- Standard Modules ---
@@ -41,20 +38,33 @@
             "return-type": "json",
             "exec": "fluxo-rs mpris",
             "on-click": "playerctl play-pause",
-            "signal": 11,
+            "signal": 11
-            "interval": 0
         },
         "tray": {
             "icon-size": 18,
             "spacing": 10
         },
-
+        "group/spaces": {
+            "orientation": "horizontal",
+            "modules": [
+                "hyprland/workspaces",
+                "hyprland/window"
+            ]
+        },
+        "group/powertray": {
+            "orientation": "horizontal",
+            "modules": [
+                "tray",
+                "custom/dnd",
+                "custom/gamemode",
+                "custom/power_status"
+            ]
+        },
         "group/center": {
             "orientation": "horizontal",
             "modules": [
                 "custom/mpris",
                 "clock"
-                // "custom/dnd"
             ]
         },
         "custom/gamemode": {
@@ -62,8 +72,7 @@
             "return-type": "json",
             "exec": "fluxo-rs game",
             "on-click": "~/.config/hypr/scripts/gamemode.sh",
-            "signal": 7,
+            "signal": 7
-            "interval": 5
         },
 
         "custom/power_status": {
@@ -95,7 +104,8 @@
                 "custom/cpu",
                 "custom/mem",
                 "custom/disk-root",
-                "custom/network"
+                "custom/network",
+                "custom/backlight"
             ]
         },
         "modules-center": [
@@ -112,44 +122,39 @@
             "return-type": "json",
             "exec": "fluxo-rs sys",
             "signal": 5,
-            "interval": 1
+            "interval": 5
         },
         "custom/cpu": {
             "format": "{}",
             "return-type": "json",
             "exec": "fluxo-rs cpu",
             "on-click": "zenmonitor & disown",
-            "signal": 2,
+            "signal": 2
-            "interval": 1
         },
         "custom/mem": {
             "format": "{}",
             "return-type": "json",
             "exec": "fluxo-rs mem",
-            "signal": 3,
+            "signal": 3
-            "interval": 1
         },
         "custom/gpu": {
             "format": "{}",
             "return-type": "json",
             "exec": "fluxo-rs gpu",
-            "signal": 4,
+            "signal": 4
-            "interval": 1
         },
         "custom/network": {
             "format": "{}",
             "return-type": "json",
             "exec": "fluxo-rs net",
-            "signal": 1,
+            "signal": 1
-            "interval": 1
         },
 
         "custom/disk-root": {
             "format": "{}",
             "return-type": "json",
             "exec": "fluxo-rs disk /",
-            "signal": 6,
+            "signal": 6
-            "interval": 1
         },
 
         // --- Fluxo-rs Audio & BT ---
@@ -162,8 +167,7 @@
             "on-scroll-down": "fluxo-rs vol down 5",
             "on-click-right": "fluxo-rs vol cycle",
             "on-click-middle": "pavucontrol",
-            "signal": 8,
+            "signal": 8
-            "interval": 1
         },
         "custom/mic": {
             "format": "{}",
@@ -174,8 +178,7 @@
             "on-scroll-down": "fluxo-rs mic down 5",
             "on-click-right": "fluxo-rs mic cycle",
             "on-click-middle": "pavucontrol",
-            "signal": 8,
+            "signal": 8
-            "interval": 1
         },
         "custom/bluetooth-audio": {
             "format": "{}",
@@ -184,7 +187,6 @@
             "on-click": "fluxo-rs bt menu",
             "on-click-right": "fluxo-rs bt cycle_mode",
             "signal": 9,
-            "interval": 1,
             "tooltip": true
         },
         "custom/dnd": {
@@ -192,8 +194,15 @@
             "return-type": "json",
             "exec": "fluxo-rs dnd",
             "on-click": "fluxo-rs dnd toggle",
-            "signal": 14,
+            "signal": 13
-            "interval": 0
+        },
+        "custom/backlight": {
+            "format": "{}",
+            "return-type": "json",
+            "exec": "fluxo-rs backlight",
+            "on-scroll-up": "brightnessctl s +10%",
+            "on-scroll-down": "brightnessctl s 10%",
+            "signal": 12
         }
     }
 ]

waybar/style.css

@@ -32,6 +32,8 @@ window#waybar.bottom {
 #window,
 #tray,
 #hardware,
+#powertray,
+#spaces,
 #custom-bluetooth-audio,
 #custom-volume,
 #custom-buds,
@@ -90,36 +92,17 @@ window#waybar.bottom {
   box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.15);
 }
 
-/* --- Power Status --- */
-#custom-power_status {
-  font-weight: bold;
-}
-#custom-power_status.charging {
-  color: @green;
-}
-#custom-power_status.warning {
-  color: @peach;
-}
-#custom-power_status.critical {
-  color: @red;
-  animation: blink 1s infinite alternate;
-}
-
-@keyframes blink {
-  to {
-    color: @base;
-    background-color: @red;
-  }
-}
 
 /* --- Hardware Group (Left Bottom) --- */
-#hardware {
+#hardware, #powertray, #spaces {
   border-radius: 24px;
   padding: 4px 10px;
 }
 
 /* Strip backgrounds and borders from the items inside the group */
 #custom-cpu,
+#workspaces,
+#window,
 #custom-mem,
 #custom-network
 #custom-sys,
@@ -127,7 +110,12 @@ window#waybar.bottom {
 #custom-disk-root,
 #custom-mpris,
 #clock, 
-#custom-dnd {
+#custom-dnd,
+#custom-backlight,
+#tray, 
+#custom-gamemode, 
+#custom-dnd, 
+#custom-power_status {
   background-color: transparent;
   border: none;
   box-shadow: none;
@@ -141,14 +129,18 @@ window#waybar.bottom {
 #custom-sys,
 #custom-gpu,
 #custom-disk-root,
-#custom-mpris
+#custom-mpris,
-/* #clock */ {
+#custom-network,
+#tray, 
+#custom-gamemode, 
+#custom-dnd {
   border-right: 1px solid alpha(@surface1, 0.5);
   border-radius: 0;
 }
 
 #custom-network {
     padding-left: 8px;
+    padding-right: 8px;
     color: @mauve;
 }
 
@@ -223,3 +215,21 @@ tooltip label {
   padding: 8px;
 }
 
+/* --- Power Status --- */
+#custom-power_status.charging {
+  color: @green;
+}
+#custom-power_status.warning {
+  color: @peach;
+}
+#custom-power_status.critical {
+  color: @red;
+  animation: blink 1s infinite alternate;
+}
+
+@keyframes blink {
+  to {
+    color: @base;
+    background-color: @red;
+  }
+}