From 25a84fa685529e0e295a5d47eacb06b7c0a65adf Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Sat, 21 Mar 2026 12:01:11 -0700
Subject: [PATCH] Propagate taffybar tray startup fix through local flakes

---
 dotfiles/config/taffybar/flake.lock | 15 +++++++++------
 dotfiles/config/taffybar/flake.nix  |  5 ++++-
 dotfiles/config/taffybar/taffybar   |  2 +-
 nixos/flake.lock                    | 28 ++++++++++++++++------------
 nixos/justfile                      |  2 +-
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock
index 3ec082bf..e073aadf 100644
--- a/dotfiles/config/taffybar/flake.lock
+++ b/dotfiles/config/taffybar/flake.lock
@@ -288,14 +288,17 @@
         "xmonad-contrib": "xmonad-contrib"
       },
       "locked": {
-        "lastModified": 1773988595,
-        "narHash": "sha256-Zhsp/uRmTRaTkXL/hKwcSPZAHohCw26631Sg43LtvYQ=",
-        "path": "/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar",
-        "type": "path"
+        "lastModified": 1774119529,
+        "narHash": "sha256-Sx+Lpd5y9zp79/oHkNIsd8Z52g271PO/1fQXcqaDtNc=",
+        "ref": "refs/heads/master",
+        "rev": "7feaa6a9881376fecf4645cc84e93f3173f6fcb3",
+        "revCount": 2266,
+        "type": "git",
+        "url": "file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar"
       },
       "original": {
-        "path": "/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar",
-        "type": "path"
+        "type": "git",
+        "url": "file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar"
       }
     },
     "weeder-nix": {
diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix
index 18fd4ae0..c74cb344 100644
--- a/dotfiles/config/taffybar/flake.nix
+++ b/dotfiles/config/taffybar/flake.nix
@@ -49,7 +49,10 @@
       flake = false;
     };
     taffybar = {
-      url = "path:/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar";
+      # Use the local git checkout, not a raw path snapshot, so gitignored
+      # build artifacts like dist-newstyle/.worktrees/.direnv don't get copied
+      # into flake-input store sources.
+      url = "git+file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
       inputs.xmonad.follows = "xmonad";
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index d6118365..7feaa6a9 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit d61183651d32957bd9e84a3af66cd80d662b5896
+Subproject commit 7feaa6a9881376fecf4645cc84e93f3173f6fcb3
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 32c27df6..8bf2b007 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1977,14 +1977,17 @@
         "xmonad-contrib": "xmonad-contrib"
       },
       "locked": {
-        "lastModified": 1773949510,
-        "narHash": "sha256-c3fpnmJfK4KaN8DmdUYgFqeLjcMsxCyNd24864Jzw8w=",
-        "path": "/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar",
-        "type": "path"
+        "lastModified": 1774119529,
+        "narHash": "sha256-Sx+Lpd5y9zp79/oHkNIsd8Z52g271PO/1fQXcqaDtNc=",
+        "ref": "refs/heads/master",
+        "rev": "7feaa6a9881376fecf4645cc84e93f3173f6fcb3",
+        "revCount": 2266,
+        "type": "git",
+        "url": "file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar"
       },
       "original": {
-        "path": "/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar",
-        "type": "path"
+        "type": "git",
+        "url": "file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar"
       }
     },
     "taffybar_2": {
@@ -2004,12 +2007,13 @@
         ]
       },
       "locked": {
-        "lastModified": 1773598038,
-        "narHash": "sha256-raml4gCrMtW/hNt2T6E7U7Y+8fDwdRjnsLcNRU7ZmcA=",
-        "owner": "taffybar",
-        "repo": "taffybar",
-        "rev": "3a9cae8b9ff13afd7f2687f10d022620c3e26448",
-        "type": "github"
+        "lastModified": 1774119529,
+        "narHash": "sha256-Sx+Lpd5y9zp79/oHkNIsd8Z52g271PO/1fQXcqaDtNc=",
+        "ref": "refs/heads/master",
+        "rev": "7feaa6a9881376fecf4645cc84e93f3173f6fcb3",
+        "revCount": 2266,
+        "type": "git",
+        "url": "file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar"
       },
       "original": {
         "owner": "taffybar",
diff --git a/nixos/justfile b/nixos/justfile
index 6ca8da17..3f19ce07 100644
--- a/nixos/justfile
+++ b/nixos/justfile
@@ -18,7 +18,7 @@ switch-local-taffybar *args:
 	  while systemctl is-active --quiet nixos-rebuild-switch-to-configuration.service; do sleep 1; done; \
 	fi'
 	sudo nixos-rebuild switch --flake "git+https://github.com/colonelpanic8/dotfiles.git?ref=master&dir=nixos#" --impure --option warn-dirty false \
-	  --override-input taffybar path:../dotfiles/config/taffybar/taffybar \
+	  --override-input taffybar git+file:///home/imalison/dotfiles/dotfiles/config/taffybar/taffybar \
 	  {{args}}
 
 remote-switch host *args: