Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos

home/hyprland/waybar/default.nix

@@ -21,6 +21,7 @@
         "custom/notification"
         "clock"
         "custom/separator"
+        "backlight"
         "battery"
         "tray"
       ];
@@ -126,7 +127,7 @@
         };
       };
       backlight = {
-        format = "{icon}";
+        format = "{icon} ";
         tooltip-format = "{percent}%";
         format-icons = [ "" "" "" "" "" "" "" "" "" ];
       };
@@ -135,10 +136,10 @@
           warning = 30;
           critical = 15;
         };
-        format = "{icon} {capacity}%";
-        format-charging = "󰂄 {capacity}%";
-        format-plugged = "󰚥";
-        tooltip-format = "{time}";
+        format = "{icon} ";
+        format-charging = "󰂄 ";
+        format-plugged = "󰚥 ";
+        tooltip-format = "{capacity}% {time}";
         format-icons = [ "󱃍" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
       };
       "custom/notification" = {

home/hyprland/waybar/style.css

@@ -73,6 +73,7 @@ tooltip {
 #window,
 #mpris,
 #pulseaudio,
+#backlight,
 #battery,
 #clock,
 #custom-notification,
@@ -114,6 +115,7 @@ tooltip {
 #clock {
 	color: @blue;
 }
+#backlight,
 #battery {
 	color: @lavender;
 }