diff --git a/dotfiles/config/taffybar/flake.lock b/dotfiles/config/taffybar/flake.lock
index 4e265c5a..08987f91 100644
--- a/dotfiles/config/taffybar/flake.lock
+++ b/dotfiles/config/taffybar/flake.lock
@@ -34,9 +34,15 @@
     },
     "dbus-menu": {
       "inputs": {
-        "flake-utils": "flake-utils",
-        "git-ignore-nix": "git-ignore-nix",
-        "nixpkgs": "nixpkgs"
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "git-ignore-nix": [
+          "git-ignore-nix"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1770957161,
@@ -86,64 +92,9 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "git-ignore-nix": {
       "inputs": {
         "nixpkgs": [
-          "dbus-menu",
           "nixpkgs"
         ]
       },
@@ -161,86 +112,6 @@
         "type": "github"
       }
     },
-    "git-ignore-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "gtk-sni-tray",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "git-ignore-nix_3": {
-      "inputs": {
-        "nixpkgs": [
-          "gtk-strut",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "git-ignore-nix_4": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1762808025,
-        "narHash": "sha256-XmjITeZNMTQXGhhww6ed/Wacy2KzD6svioyCX7pkUu4=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "master",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "git-ignore-nix_5": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1762808025,
-        "narHash": "sha256-XmjITeZNMTQXGhhww6ed/Wacy2KzD6svioyCX7pkUu4=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "ref": "master",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -272,7 +143,9 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "git-ignore-nix": "git-ignore-nix_2",
+        "git-ignore-nix": [
+          "git-ignore-nix"
+        ],
         "gtk-strut": [
           "gtk-strut"
         ],
@@ -284,11 +157,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770888586,
-        "narHash": "sha256-FAaQuetRjb71PDbWIWeoUrpJkvLW9BwykSQnZ9V+Ko8=",
+        "lastModified": 1771570735,
+        "narHash": "sha256-WrqV4JYtqF0fn2n8uVnxv08d2+IG+R3LHOJz4M1AE58=",
         "owner": "taffybar",
         "repo": "gtk-sni-tray",
-        "rev": "75a65ec38397529aafd322552e88f1d4917a1050",
+        "rev": "61e075f9521f89e04fadf27c094ef9480fda8164",
         "type": "github"
       },
       "original": {
@@ -302,7 +175,9 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "git-ignore-nix": "git-ignore-nix_3",
+        "git-ignore-nix": [
+          "git-ignore-nix"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -323,11 +198,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1770562336,
-        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
         "type": "github"
       },
       "original": {
@@ -337,85 +212,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1770562336,
-        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1666603677,
-        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1730768919,
-        "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1666603677,
-        "narHash": "sha256-apAEIj+z1iwMaMJ4tB21r/VTetfGDLDzuhXRHJknIAU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "074da18a72269cc5a6cf444dce42daea5649b2fe",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1770537093,
-        "narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
         "gitignore": "gitignore",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1747372754,
@@ -435,10 +238,11 @@
       "inputs": {
         "dbus-hslogger": "dbus-hslogger",
         "dbus-menu": "dbus-menu",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
+        "git-ignore-nix": "git-ignore-nix",
         "gtk-sni-tray": "gtk-sni-tray",
         "gtk-strut": "gtk-strut",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "status-notifier-item": "status-notifier-item",
         "taffybar": "taffybar",
         "xmonad": "xmonad"
@@ -449,17 +253,19 @@
         "flake-utils": [
           "flake-utils"
         ],
-        "git-ignore-nix": "git-ignore-nix_4",
+        "git-ignore-nix": [
+          "git-ignore-nix"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1770970375,
-        "narHash": "sha256-0G5dkc1bjAdbAJBBnipeEE2HbEkd4+bdkyRraumMRs4=",
+        "lastModified": 1771366898,
+        "narHash": "sha256-P032QnjoXfrr20LW+EBq/5fWDhDnYe7mJRkjEMf4EGE=",
         "owner": "taffybar",
         "repo": "status-notifier-item",
-        "rev": "233aa43606036d06e58f19be156c48fa979506f2",
+        "rev": "e73da596911511034af94637d57cec8ccd1f68e2",
         "type": "github"
       },
       "original": {
@@ -483,58 +289,15 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "taffybar": {
       "inputs": {
         "dbus-hslogger": "dbus-hslogger_2",
         "dbus-menu": [
           "dbus-menu"
         ],
-        "flake-utils": "flake-utils_3",
+        "flake-utils": [
+          "flake-utils"
+        ],
         "gtk-sni-tray": [
           "gtk-sni-tray"
         ],
@@ -554,8 +317,8 @@
         "xmonad-contrib": "xmonad-contrib"
       },
       "locked": {
-        "lastModified": 1771578172,
-        "narHash": "sha256-MOtI2hzDngvc2e+PhDDkUwQ0j6PlPwRKZOvcqt8cO04=",
+        "lastModified": 1771579790,
+        "narHash": "sha256-f4JtfFkFV3eYYq7X/LPJcH0XC5s8Q+pV0mNjo9fneSc=",
         "path": "/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar",
         "type": "path"
       },
@@ -564,22 +327,6 @@
         "type": "path"
       }
     },
-    "unstable": {
-      "locked": {
-        "lastModified": 1770562336,
-        "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d6c71932130818840fc8fe9509cf50be8c64634f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "weeder-nix": {
       "inputs": {
         "nixpkgs": [
@@ -604,10 +351,18 @@
     },
     "xmonad": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
-        "git-ignore-nix": "git-ignore-nix_5",
-        "nixpkgs": "nixpkgs_6",
-        "unstable": "unstable"
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "git-ignore-nix": [
+          "git-ignore-nix"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "unstable": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1767819257,
diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix
index 68ebfc58..55b5f0ee 100644
--- a/dotfiles/config/taffybar/flake.nix
+++ b/dotfiles/config/taffybar/flake.nix
@@ -2,26 +2,43 @@
   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";
+    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";
+    };
     dbus-menu = {
       url = "github:taffybar/dbus-menu";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.git-ignore-nix.follows = "git-ignore-nix";
     };
     status-notifier-item = {
       url = "github:taffybar/status-notifier-item";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
+      inputs.git-ignore-nix.follows = "git-ignore-nix";
     };
     gtk-strut = {
       url = "github:taffybar/gtk-strut";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
+      inputs.git-ignore-nix.follows = "git-ignore-nix";
     };
     gtk-sni-tray = {
       url = "github:taffybar/gtk-sni-tray";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
+      inputs.git-ignore-nix.follows = "git-ignore-nix";
       inputs.gtk-strut.follows = "gtk-strut";
       inputs.status-notifier-item.follows = "status-notifier-item";
       inputs.dbus-menu.follows = "dbus-menu";
@@ -34,11 +51,13 @@
     taffybar = {
       url = "path:/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
       inputs.gtk-sni-tray.follows = "gtk-sni-tray";
       inputs.gtk-strut.follows = "gtk-strut";
       inputs.status-notifier-item.follows = "status-notifier-item";
       inputs.dbus-menu.follows = "dbus-menu";
       inputs.xmonad.follows = "xmonad";
+      inputs.weeder-nix.inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
     };
   };
   outputs = {
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index ff1a388a..31fbc023 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit ff1a388a4780d531c50457b1b4d19f88816ba1ed
+Subproject commit 31fbc023b086c664dc563fd91a37a80fa9ffc1be
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 692e46ed..a1d3cbc5 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -230,11 +230,11 @@
     "dbus-menu_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1770753441,
-        "narHash": "sha256-ycJexWPCSlLriDAouT3PvRnbwByeGF6bsQrvWcY1eGU=",
+        "lastModified": 1770957161,
+        "narHash": "sha256-jXLEo7toB/1Vm5VUPYLsdforwT23Cn3KAajhZhDbqG8=",
         "owner": "taffybar",
         "repo": "dbus-menu",
-        "rev": "83f914ab70485331f4e45945251557e5c7ea50fa",
+        "rev": "c18b84f7f251e520d6f6fcef290cfdd0b45ba057",
         "type": "github"
       },
       "original": {
@@ -720,11 +720,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770888586,
-        "narHash": "sha256-FAaQuetRjb71PDbWIWeoUrpJkvLW9BwykSQnZ9V+Ko8=",
+        "lastModified": 1771570735,
+        "narHash": "sha256-WrqV4JYtqF0fn2n8uVnxv08d2+IG+R3LHOJz4M1AE58=",
         "owner": "taffybar",
         "repo": "gtk-sni-tray",
-        "rev": "75a65ec38397529aafd322552e88f1d4917a1050",
+        "rev": "61e075f9521f89e04fadf27c094ef9480fda8164",
         "type": "github"
       },
       "original": {
@@ -736,11 +736,11 @@
     "gtk-sni-tray_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1770754698,
-        "narHash": "sha256-W5xZaZMeK5nLwrXvgh35Ko143qteLCTpCq4WwW93zcM=",
+        "lastModified": 1771570735,
+        "narHash": "sha256-WrqV4JYtqF0fn2n8uVnxv08d2+IG+R3LHOJz4M1AE58=",
         "owner": "taffybar",
         "repo": "gtk-sni-tray",
-        "rev": "f016f19fd64c1d2c4228d64c9897cd8f45272b8a",
+        "rev": "61e075f9521f89e04fadf27c094ef9480fda8164",
         "type": "github"
       },
       "original": {
@@ -1910,11 +1910,11 @@
     "status-notifier-item": {
       "flake": false,
       "locked": {
-        "lastModified": 1770253964,
-        "narHash": "sha256-tBbdN+xJmxNEZZSXYUxvVEeldzEjoL8WA45h3xU9U4w=",
+        "lastModified": 1770970375,
+        "narHash": "sha256-0G5dkc1bjAdbAJBBnipeEE2HbEkd4+bdkyRraumMRs4=",
         "owner": "taffybar",
         "repo": "status-notifier-item",
-        "rev": "08294f53c666aa85375364d5e08e952aa7510991",
+        "rev": "233aa43606036d06e58f19be156c48fa979506f2",
         "type": "github"
       },
       "original": {
@@ -1990,11 +1990,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770970661,
-        "narHash": "sha256-mYAcqIX5L1wa9judoto0X8KlbnzN51e261gUhTyyw94=",
+        "lastModified": 1771579850,
+        "narHash": "sha256-gE0FiJ4c7br4nbNJ31MyuYvT2cNq0GUacLosAkSYzFg=",
         "owner": "taffybar",
         "repo": "taffybar",
-        "rev": "4a170a399b66c1f49856153a44fce13f132dcff7",
+        "rev": "31fbc023b086c664dc563fd91a37a80fa9ffc1be",
         "type": "github"
       },
       "original": {