diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock
index 4654fbfd..1b20fbe4 100644
--- a/dotfiles/config/taffybar/flake.lock
+++ b/dotfiles/config/taffybar/flake.lock
@@ -34,26 +34,6 @@
         "type": "github"
       }
     },
-    "git-ignore-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762808025,
-        "narHash": "sha256-XmjITeZNMTQXGhhww6ed/Wacy2KzD6svioyCX7pkUu4=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -79,11 +59,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771369470,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "lastModified": 1776877367,
+        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
         "type": "github"
       },
       "original": {
@@ -117,11 +97,19 @@
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
-        "git-ignore-nix": "git-ignore-nix",
-        "nixpkgs": "nixpkgs",
+        "flake-utils": [
+          "taffybar",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "taffybar",
+          "nixpkgs"
+        ],
         "taffybar": "taffybar",
-        "xmonad": "xmonad"
+        "xmonad": [
+          "taffybar",
+          "xmonad"
+        ]
       }
     },
     "systems": {
@@ -141,16 +129,10 @@
     },
     "taffybar": {
       "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
         "weeder-nix": "weeder-nix",
-        "xmonad": [
-          "xmonad"
-        ],
+        "xmonad": "xmonad",
         "xmonad-contrib": "xmonad-contrib"
       },
       "locked": {
@@ -190,26 +172,13 @@
       }
     },
     "xmonad": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "git-ignore-nix": [
-          "git-ignore-nix"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "unstable": [
-          "nixpkgs"
-        ]
-      },
+      "flake": false,
       "locked": {
-        "lastModified": 1767819257,
-        "narHash": "sha256-U7MIHr0B10wDSNgUvq4QTK22HZ4pl2oIYkdOKEMnxC4=",
+        "lastModified": 1776502138,
+        "narHash": "sha256-mSOpNU1iJvfFh5uwayA6aPxneFMduNW1kG1gV2tGE+c=",
         "owner": "xmonad",
         "repo": "xmonad",
-        "rev": "bb33042d408c15d8727011b1ed4aa22b2716d73d",
+        "rev": "a618fb32662e44eb5d8276a3dc1925b0233e638b",
         "type": "github"
       },
       "original": {
diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix
index eeca78d2..dcdf01d2 100644
--- a/dotfiles/config/taffybar/flake.nix
+++ b/dotfiles/config/taffybar/flake.nix
@@ -1,31 +1,21 @@
 {
   inputs = {
-    flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    git-ignore-nix = {
-      url = "github:hercules-ci/gitignore.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    # Kept for compatibility with parent flakes that set `inputs.xmonad.follows`,
-    # and for taffybar's own flake inputs. We don't depend on xmonad.lib here.
-    xmonad = {
-      url = "github:xmonad/xmonad/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-      # xmonad's `unstable` input is another nixpkgs pin; keep it aligned too.
-      inputs.unstable.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.git-ignore-nix.follows = "git-ignore-nix";
-    };
     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";
       inputs.weeder-nix.inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
     };
+    # Follow the vendored taffybar flake's pins so the config shell and the
+    # library shell mostly share their nixpkgs/Haskell dependency graph.
+    flake-utils.follows = "taffybar/flake-utils";
+    nixpkgs.follows = "taffybar/nixpkgs";
+    # Kept for compatibility with parent flakes that set `inputs.xmonad.follows`.
+    # The config flake itself does not use xmonad.lib.
+    xmonad = {
+      follows = "taffybar/xmonad";
+    };
   };
   outputs = {
     self,
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 220cb5a3..ff41f4c8 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 220cb5a34d81543baebbb530731481cafba61138
+Subproject commit ff41f4c895e0b30809a8e554011fbc37c81c0cf2