2 files changed, 16 insertions, 36 deletions

diff --git a/nix/programs/waybar/default.nix b/nix/programs/waybar/default.nix
index fa78920..6e835fb 100644
--- a/nix/programs/waybar/default.nix
+++ b/nix/programs/waybar/default.nix
@@ -14,15 +14,14 @@
 
         modules-left = [
           "hyprland/workspaces"
-          "hyprland/window"
         ];
         modules-center = [
+          "clock"
         ];
         modules-right = [
           "battery"
           "wireplumber"
           "network"
-          "clock"
           "tray"
         ];
 
diff --git a/nix/programs/waybar/style.nix b/nix/programs/waybar/style.nix
index 4f751fc..6104140 100644
--- a/nix/programs/waybar/style.nix
+++ b/nix/programs/waybar/style.nix
@@ -5,7 +5,8 @@ let
     accentColor = "#${theme.colors.accent}";
     textColor = "#${theme.colors.base05}";
     baseColor = "#${theme.colors.base00}";
-    surfaceColor = "#${theme.colors.base02}";
+    mantleColor = "#${theme.colors.base01}";
+    surfaceColor = "#${theme.colors.base03}";
     greenColor = "#${theme.colors.base0B}";
     yellowColor = "#${theme.colors.base0A}";
     redColor = "#${theme.colors.base08}";
@@ -21,56 +22,39 @@ in
 ''
 /** Base */
 
+* {
+    all: unset;
+}
+
 window#waybar {
     font-family: "${theme.font.regular}", "${theme.font.icon}", "${theme.font.monospace}";
     font-size: ${fontSize};
     color: ${textColor};
-    background-color: transparent;
-}
-
-window#waybar > box {
-    margin: ${outerGap};
-    margin-bottom: 0px;
-}
-
-.modules-left,
-.modules-right {
-    padding: ${innerGap} 0px;
-    border-radius: ${outerRadius};
     background-color: ${baseColor};
-    border: ${borderWidth} solid ${accentColor};
 }
 
 /** Workspaces */
 
 #workspaces {
-    margin-left: ${innerGap};
+    margin-left: ${outerGap};
 }
 
 #workspaces button {
-    all: initial;
-    color: ${textColor};
-    background-color: transparent;
     border-radius: ${innerRadius};
-    padding: ${innerGap} ${outerGap};
+    margin: 4px 2px;
+    padding: 0px 7px;
+    background: ${surfaceColor};
+    color: ${textColor};
 }
 
 #workspaces button.focused,
 #workspaces button.active {
-    background-color: ${accentColor};
-    color: ${baseColor};
+    background: ${accentColor};
+    color: ${mantleColor};
 }
 
 #workspaces button.urgent {
-    background-color: ${redColor};
-}
-
-/** Window */
-
-window#waybar:not(.empty) #window {
-    padding: 0 ${outerGap};
-    border-left: ${borderWidth} solid ${surfaceColor};
-    margin: 0 ${innerGap};
+    background: ${redColor};
 }
 
 /** Tray */
@@ -92,11 +76,8 @@ window#waybar:not(.empty) #window {
 
 #battery,
 #wireplumber,
-#network,
-#clock {
+#network {
     padding: 0 ${outerGap};
-    border-right: ${borderWidth} solid ${surfaceColor};
-    color: ${textColor};
 }
 
 /** Battery */