From f40273ec45e6676b975d42f4bc0c44a6392b7098 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Tue, 17 Jun 2025 21:35:43 -0400
Subject: refactor styles to new color scheme basis

---
 nix/programs/waybar/style.nix | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'nix/programs/waybar')

diff --git a/nix/programs/waybar/style.nix b/nix/programs/waybar/style.nix
index 6104140..0b84514 100644
--- a/nix/programs/waybar/style.nix
+++ b/nix/programs/waybar/style.nix
@@ -2,14 +2,14 @@
 
 let
 
-    accentColor = "#${theme.colors.accent}";
-    textColor = "#${theme.colors.base05}";
-    baseColor = "#${theme.colors.base00}";
-    mantleColor = "#${theme.colors.base01}";
-    surfaceColor = "#${theme.colors.base03}";
-    greenColor = "#${theme.colors.base0B}";
-    yellowColor = "#${theme.colors.base0A}";
-    redColor = "#${theme.colors.base08}";
+    fg = "#${theme.colors.fg}";
+    bg = "#${theme.colors.bg}";
+    surface-fg = "#${theme.colors.surface.fg}";
+    surface-bg = "#${theme.colors.surface.bg}";
+    primary = "#${theme.colors.primary}";
+    success = "#${theme.colors.success}";
+    warning = "#${theme.colors.warning}";
+    error = "#${theme.colors.error}";
     fontSize = "${toString theme.font.size}px";
     outerGap = "${toString theme.outerGap}px";
     innerGap = "${toString theme.innerGap}px";
@@ -29,8 +29,8 @@ in
 window#waybar {
     font-family: "${theme.font.regular}", "${theme.font.icon}", "${theme.font.monospace}";
     font-size: ${fontSize};
-    color: ${textColor};
-    background-color: ${baseColor};
+    color: ${fg};
+    background-color: ${bg};
 }
 
 /** Workspaces */
@@ -43,18 +43,18 @@ window#waybar {
     border-radius: ${innerRadius};
     margin: 4px 2px;
     padding: 0px 7px;
-    background: ${surfaceColor};
-    color: ${textColor};
+    background: ${surface-bg};
+    color: ${surface-fg};
 }
 
 #workspaces button.focused,
 #workspaces button.active {
-    background: ${accentColor};
-    color: ${mantleColor};
+    background: ${primary};
+    color: ${bg};
 }
 
 #workspaces button.urgent {
-    background: ${redColor};
+    background: ${error};
 }
 
 /** Tray */
@@ -83,32 +83,32 @@ window#waybar {
 /** Battery */
 
 #battery.charging {
-    color: ${greenColor};
+    color: ${success};
 }
 
 #battery.warning:not(.charging) {
-    color: ${yellowColor};
+    color: ${warning};
 }
 
 #battery.critical:not(.charging) {
-    color: ${redColor};
+    color: ${error};
 }
 
 /** Wireplumber */
 
 #wireplumber.muted {
-    color: ${redColor};
+    color: ${error};
 }
 
 /** Network */
 
 #network.wifi,
 #network.ethernet {
-    color: ${greenColor};
+    color: ${success};
 }
 
 #network.disconnected {
-    color: ${redColor};
+    color: ${error};
 }
 
 ''
-- 
cgit v1.2.3-freya