niri/waybar: now pixel perfect

Signed-off-by: unexplrd <unexplrd@linerds.us>

modules/home/desktop/niri/programs/waybar/default.nix

@@ -11,8 +11,7 @@
     enable = true;
     target = "graphical-session.target";
   };
-  settings = {
-    bar-0 = {
+  settings.bar-0 = {
     # layer = "top";
     position = "bottom";
     height = 24;
@@ -28,11 +27,10 @@
     ];
     modules-center = ["clock"];
     modules-right = [
-        (ifLaptop "group/laptop")
       "wireplumber"
-        "tray"
+      (ifLaptop "group/laptop")
       "privacy"
-        (ifLaptop "power-profiles-daemon")
+      "tray"
       "idle_inhibitor"
       "custom/notification"
     ];
@@ -73,12 +71,13 @@
     "group/laptop" = {
       orientation = "inherit";
       modules = [
-          "battery"
         "backlight"
+        "battery"
+        "power-profiles-daemon"
       ];
     };
     "backlight" = {
-        format = "{icon}  {percent}%";
+      format = "{percent}% {icon}";
       format-icons = [
         "󰃚"
         "󰃛"
@@ -112,10 +111,10 @@
         warning = 30;
         critical = 15;
       };
-        format = "{icon} {capacity}%";
-        format-full = "󱟢 {capacity}%";
-        format-charging = "󰂄 {capacity}%";
-        format-plugged = "󰚥 {capacity}%";
+      format = "{capacity}% {icon}";
+      format-full = "{capacity}% 󱟢";
+      format-charging = "{capacity}% 󰂄";
+      format-plugged = "{capacity}% 󰚥";
       format-alt = "{icon} {time}";
       format-icons = ["󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹"];
     };
@@ -150,7 +149,7 @@
     };
     "wireplumber" = {
       scroll-step = 3;
-        format = "{icon} {volume}%";
+      format = "{volume}% {icon}";
       format-muted = "󰖁";
       format-icons = ["󰕿" "󰖀" "󰕾"];
       on-click = getExe pkgs.pwvucontrol;
@@ -189,13 +188,13 @@
     };
     "wlr/taskbar" = {
       format = "{icon}";
-        icon-size = 20;
+      icon-size = 18;
       icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
       tooltip-format = "{title}";
       on-click = "activate";
     };
   };
-  };
+
   style = ''
     @define-color base00 #${colors.base00};
     @define-color base01 #${colors.base01};
@@ -216,11 +215,10 @@
     * {
       font-family: ${config.stylix.fonts.sansSerif.name}, FontAwesome;
       font-weight: 500;
-        font-size: 100%;
+      font-size: 18px;
     }
     window#waybar {
       background-color: transparent;
-        color: @base05;
     }
     .modules-center {
       background-color: transparent;
@@ -239,7 +237,7 @@
       border-radius: 24px;
       border: 3px solid @base0D;
       color: @base05;
-        padding: 0 0.4em;
+      padding: 0 3px;
     }
     tooltip {
       background: @base01;
@@ -260,28 +258,32 @@
       background-color: rgba(0, 0, 0, 0.2);
       box-shadow: inset 0 -3px @base05;
     }
-    #battery,
     #backlight,
-    /* #workspaces,
-    #taskbar,
-    #privacy, */
-    #taskbar button,
-    #language,
+    #battery,
     #clock,
-    #battery,
-    #backlight,
-    #wireplumber,
-    #workspaces button,
     #custom-notification,
+    #custom-separator,
     #idle_inhibitor,
+    #language,
     #power-profiles-daemon,
     #privacy-item,
-    #custom-separator {
-      padding: 0 0.3em;
+    #taskbar button,
+    #taskbar,
+    #wireplumber,
+    #workspaces button {
+      padding: 0 6px;
     }
-    #tray button {
-      padding: 0 0.3em;
-      margin: 0 0.2em;
+    #backlight,
+    #custom-notification,
+    #idle_inhibitor,
+    #tray button,
+    #tray {
+      padding: 0 6px 0 0;
+      margin: 0 6px 0 0;
+    }
+    #power-profiles-daemon {
+      padding: 0 6px;
+      margin: 0 6px;
     }
     #workspaces button.active {
       color: @base0D;