From 2093304e4c6d5ed804e6ee2b9fb55b49150c25cf Mon Sep 17 00:00:00 2001
From: unexplrd <unexplrd@linerds.us>
Date: Mon, 30 Jun 2025 22:12:37 +0300
Subject: [PATCH] niri/waybar: polished

Signed-off-by: unexplrd <unexplrd@linerds.us>
---
 .../desktop/niri/programs/waybar/default.nix  | 92 ++++++++++---------
 1 file changed, 47 insertions(+), 45 deletions(-)

diff --git a/modules/home/desktop/niri/programs/waybar/default.nix b/modules/home/desktop/niri/programs/waybar/default.nix
index d669650..76f7a9c 100644
--- a/modules/home/desktop/niri/programs/waybar/default.nix
+++ b/modules/home/desktop/niri/programs/waybar/default.nix
@@ -24,12 +24,12 @@
       "niri/language"
       "niri/workspaces"
       "wlr/taskbar"
+      "privacy"
     ];
     modules-center = ["clock"];
     modules-right = [
       "wireplumber"
       (ifLaptop "group/laptop")
-      "privacy"
       "tray"
       "idle_inhibitor"
       "custom/notification"
@@ -96,7 +96,7 @@
       };
     };
     "tray" = {
-      icon-size = 24;
+      icon-size = 20;
       spacing = 6;
     };
     "clock" = {
@@ -172,8 +172,8 @@
       escape = true;
     };
     "privacy" = {
-      icon-spacing = 2;
-      icon-size = 16;
+      icon-spacing = 0;
+      icon-size = 18;
       transition-duration = 250;
       screenshare = {
         type = "screenshare";
@@ -188,7 +188,7 @@
     };
     "wlr/taskbar" = {
       format = "{icon}";
-      icon-size = 24;
+      icon-size = 20;
       icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
       tooltip-format = "{title}";
       on-click = "activate";
@@ -217,12 +217,8 @@
       font-weight: 500;
       font-size: 18px;
     }
-    window#waybar {
-      background-color: transparent;
-    }
-    .modules-center {
-      background-color: transparent;
-    }
+    window#waybar,
+    .modules-center,
     .mpris.stopped {
       background-color: transparent;
     }
@@ -241,6 +237,7 @@
     tooltip {
       background: @base01;
       border: 1px solid @base0E;
+      border-radius: 24px;
     }
     tooltip label {
       color: @base05;
@@ -265,36 +262,28 @@
     #idle_inhibitor,
     #language,
     #power-profiles-daemon,
+    #privacy,
     #privacy-item,
     #taskbar,
+    #tray,
     #wireplumber,
     #workspaces button,
-    #clock,
-    #language,
-    #taskbar,
-    #tray,
-    #privacy,
-    #idle_inhibitor,
-    #custom-notification,
     #workspaces {
       border-radius: 24px;
       background-color: @base01;
       margin: 3px 3px 3px 0;
       padding: 0 6px;
     }
-    #taskbar,
-    #workspaces {
-      padding: 0;
-    }
-    #privacy {
-      padding: 0 2px;
-    }
+    /* left modules */
     #language,
     #clock,
     #wireplumber {
       margin: 3px;
     }
-    #tray button,
+    #taskbar button {
+      padding: 0 2px;
+      margin: 3px;
+    }
     #workspaces button {
       padding: 0 4px;
       margin: 3px;
@@ -303,24 +292,23 @@
       padding: 0 6px;
       margin: 3px;
     }
-    #taskbar button {
-      padding: 0;
-      margin: 3px;
+    #privacy-item {
+      padding: 0 4px;
     }
-    #wireplumber,
+    #backlight,
+    #battery,
+    #custom-notification,
     #idle_inhibitor,
-    #custom-notification {
+    #wireplumber {
       padding: 0 14px 0 10px;
     }
-    #backlight {
-      padding: 0 8px;
+    #power-profiles-daemon {
+      padding: 0 16px 0 8px;
     }
-    #workspaces button.active {
-      color: @base00;
-      background-color: @base0D;
-    }
-    #taskbar button:hover {
-      background-color: @base0D;
+    #privacy,
+    #taskbar,
+    #workspaces {
+      padding: 0;
     }
     #taskbar.empty,
     window#empty {
@@ -328,8 +316,16 @@
       margin: 0;
       background-color: transparent;
     }
+    #taskbar button:hover {
+      background-color: @base0D;
+    }
+    #workspaces button.active {
+      color: @base00;
+      background-color: @base0D;
+    }
     #battery.critical:not(.charging) {
-      color: @base09;
+      background-color: @base09;
+      color: @base00;
       animation-name: blink;
       animation-duration: 0.5s;
       animation-timing-function: steps(12);
@@ -337,13 +333,15 @@
       animation-direction: alternate;
     }
     #power-profiles-daemon.performance {
-      color: @base0D;
+      background-color: @base0D;
+      color: @base00;
     }
     #power-profiles-daemon.balanced {
-      color: @base0B;
+      color: @base05;
     }
     #power-profiles-daemon.power-saver {
-      color: @base0A;
+      background-color: @base0A;
+      color: @base00;
     }
     label:focus {
       background-color: #000000;
@@ -356,10 +354,14 @@
       background-color: @base08;
     }
     #privacy-item.screenshare {
-      color: @base0C;
+      background-color: @base0C;
+      color: @base00;
+      margin: 3px 0 3px 3px;
     }
     #privacy-item.audio-in {
-      color: @base0E;
+      background-color: @base0E;
+      color: @base00;
+      margin: 3px;
     }
   '';
 }