From 4befbc42dfab253b123f34d5e76d060deff23c74 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 10 Apr 2026 13:40:30 -0700
Subject: [PATCH] taffybar: propagate config and flake updates

---
 dotfiles/config/taffybar/flake.lock      | 8 ++++----
 dotfiles/config/taffybar/ryzen-shine.css | 5 -----
 dotfiles/config/taffybar/taffybar.css    | 8 +++-----
 dotfiles/config/taffybar/taffybar.hs     | 8 ++++----
 nixos/flake.lock                         | 6 +++---
 nixos/taffybar.nix                       | 1 +
 6 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock
index 5aac6c2c..9ac5f2f2 100644
--- a/dotfiles/config/taffybar/flake.lock
+++ b/dotfiles/config/taffybar/flake.lock
@@ -154,11 +154,11 @@
         "xmonad-contrib": "xmonad-contrib"
       },
       "locked": {
-        "lastModified": 1774329399,
-        "narHash": "sha256-oh+CrJ00DZUNo85jGmMEX1iSnUVOFlu1JgmehiiaaU8=",
+        "lastModified": 1775849309,
+        "narHash": "sha256-P6hUt9pjNkTl5iXSrjlQnrghSqYBKPlUr2xIn2OTcXY=",
         "ref": "refs/heads/master",
-        "rev": "829857162b8913edd1c457b357c50c92077560de",
-        "revCount": 2269,
+        "rev": "07442aaeae81ee5537d58b22ded3bea799af39ec",
+        "revCount": 2279,
         "type": "git",
         "url": "file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar"
       },
diff --git a/dotfiles/config/taffybar/ryzen-shine.css b/dotfiles/config/taffybar/ryzen-shine.css
index 881cbade..d6014fd6 100644
--- a/dotfiles/config/taffybar/ryzen-shine.css
+++ b/dotfiles/config/taffybar/ryzen-shine.css
@@ -53,8 +53,3 @@
 	padding: 0px 3px;
 	margin-left: 2px;
 }
-
-/* Debug probe: verify host CSS can target the visible CPU pill directly. */
-.outer-pad.cpu {
-	background-color: rgba(255, 0, 0, 1.0);
-}
diff --git a/dotfiles/config/taffybar/taffybar.css b/dotfiles/config/taffybar/taffybar.css
index 442de632..dd15edbb 100644
--- a/dotfiles/config/taffybar/taffybar.css
+++ b/dotfiles/config/taffybar/taffybar.css
@@ -1,11 +1,9 @@
 /* Widget/layout styling for taffybar.
  *
- * Colors live in `theme.css` (loaded via `palette.css`).
- * IMPORTANT: use `@import url("...")` — bare `import` is silently ignored
- * by GTK's CSS parser.
+ * Colors live in `theme.css`, and the end-widget palette lives in
+ * `end-widget-colors.css`. Both are loaded explicitly from `cssPaths` so they
+ * hot-reload reliably and do not depend on GTK's `@import` handling.
  */
-@import url("theme.css");
-@import url("end-widget-colors.css");
 
 /* Base typography + foreground color for the bar itself.
  *
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index 9b3afb93..54165062 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -246,13 +246,13 @@ workspaceWindowIconGetter =
 -- ** Host Overrides
 
 defaultCssFiles :: [FilePath]
-defaultCssFiles = ["palette.css", "taffybar.css"]
+defaultCssFiles = ["theme.css", "end-widget-colors.css", "taffybar.css"]
 
 cssFilesByHostname :: [(String, [FilePath])]
 cssFilesByHostname =
-  [ ("imalison-home", ["palette.css", "taffybar.css"]),
-    ("ryzen-shine", ["palette.css", "taffybar.css", "ryzen-shine.css"]),
-    ("stevie-nixos", ["palette.css", "taffybar.css"])
+  [ ("imalison-home", ["theme.css", "end-widget-colors.css", "taffybar.css"]),
+    ("ryzen-shine", ["theme.css", "end-widget-colors.css", "taffybar.css", "ryzen-shine.css"]),
+    ("stevie-nixos", ["theme.css", "end-widget-colors.css", "taffybar.css"])
   ]
 
 laptopHosts :: [String]
diff --git a/nixos/flake.lock b/nixos/flake.lock
index f7beb8a5..540af461 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1766,11 +1766,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774898891,
-        "narHash": "sha256-tcF4Ue3rOokU6emEqFaedjfRjYLfRzVZ2cm5VBXUrX0=",
+        "lastModified": 1775849309,
+        "narHash": "sha256-P6hUt9pjNkTl5iXSrjlQnrghSqYBKPlUr2xIn2OTcXY=",
         "owner": "taffybar",
         "repo": "taffybar",
-        "rev": "989725362fc6a04fbbee8ff0de5f68fa2ee0636f",
+        "rev": "07442aaeae81ee5537d58b22ded3bea799af39ec",
         "type": "github"
       },
       "original": {
diff --git a/nixos/taffybar.nix b/nixos/taffybar.nix
index beda3771..c253f3c6 100644
--- a/nixos/taffybar.nix
+++ b/nixos/taffybar.nix
@@ -58,6 +58,7 @@ makeEnable config "myModules.taffybar" false {
         enable = true;
         package = inputs.imalison-taffybar.defaultPackage.${pkgs.stdenv.hostPlatform.system};
       };
+      xdg.configFile."systemd/user/taffybar.service".force = true;
       systemd.user.services.taffybar.Service = {
         ExecCondition = "${skipTaffybarInKde}";
         # Temporary startup debugging: keep a plain-text log outside journald so