diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index eb9f7b9f..07656d70 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit eb9f7b9f43898201237000b921d1224c47d7dac7
+Subproject commit 07656d70f6bf59a4d1355243f595805b9c0a25df
diff --git a/dotfiles/config/xmonad/overlay.nix b/dotfiles/config/xmonad/overlay.nix
new file mode 100644
index 00000000..1f1cf24e
--- /dev/null
+++ b/dotfiles/config/xmonad/overlay.nix
@@ -0,0 +1,12 @@
+_: pkgs: rec {
+  haskellPackages = pkgs.haskellPackages.override (old: {
+    overrides = pkgs.lib.composeExtensions (old.overrides or (_: _: {})) (self: super: rec {
+      xmonad = super.xmonad.overrideAttrs (_: {
+        src = fetchGit ./xmonad;
+      });
+      xmonad-contrib = super.xmonad-contrib.overrideAttrs (_: {
+        src = fetchGit ./xmonad-contrib;
+      });
+    });
+  });
+}
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 9039b4bc..7361d44b 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -1,7 +1,6 @@
 { config, pkgs, options, ... }:
 let
   all-hies = import (fetchTarball "https://github.com/infinisil/all-hies/tarball/master") {};
-  my-overlays = import ./overlays.nix;
   my-python-packages = python-packages: with python-packages; [
     appdirs
     ipdb
@@ -17,10 +16,17 @@ let
     virtualenvwrapper
   ];
   python-with-my-packages = pkgs.python3.withPackages my-python-packages;
+  taffySource = pkgs.lib.sourceByRegex ../dotfiles/config/taffybar [
+    "taffybar.hs" "imalison-taffybar.cabal"
+  ];
+  xmonadSource = ../dotfiles/config/xmonad;
 in
 {
-  nixpkgs.overlays = [ my-overlays ];
-  # XXX: This ensures that all nix tools pick up the overlays that are set here
+  nixpkgs.overlays = [
+    (import ./overlays.nix)
+    (import ../dotfiles/config/taffybar/taffybar/overlay.nix)
+    (import ../dotfiles/config/xmonad/overlay.nix)
+  ];
 
   # Allow all the things
   nixpkgs.config.allowUnfree = true;
@@ -106,7 +112,9 @@ in
     gnome-breeze
 
     # Desktop
-    # haskellPackages.status-notifier-item
+    (haskellPackages.callCabal2nix "imalison-taffybar" taffySource { })
+    (haskellPackages.callCabal2nix "imalison-xmonad" xmonadSource { })
+    haskellPackages.status-notifier-item
     autorandr
     betterlockscreen
     blueman