diff --git a/Brewfile b/Brewfile
deleted file mode 120000
index 1e600268..00000000
--- a/Brewfile
+++ /dev/null
@@ -1 +0,0 @@
-tasks/brewfiles/essential
\ No newline at end of file
diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix
index e5fbb813..2b8dcb2b 100644
--- a/dotfiles/config/taffybar/flake.nix
+++ b/dotfiles/config/taffybar/flake.nix
@@ -2,33 +2,17 @@
   inputs = {
     taffybar.url = path:./taffybar;
     flake-utils.url = github:numtide/flake-utils;
-    git-ignore-nix.url = github:IvanMalison/gitignore.nix/master;
   };
-  outputs = { self, flake-utils, taffybar, git-ignore-nix, nixpkgs }:
+  outputs = { self, flake-utils, taffybar, nixpkgs }:
     let
-    overlay = final: prev: {
-      haskellPackages = prev.haskellPackages.override (old: {
-        overrides = prev.lib.composeExtensions (old.overrides or (_: _: {}))
-        (hself: hsuper: {
-          imalison-taffybar = hself.callCabal2nix "imalison-taffybar"
-          (git-ignore-nix.gitIgnoreSource ./.)
-          { };
-          coinbase-pro = hself.callCabal2nix "coinbase-pro" (final.fetchFromGitHub {
-            owner = "IvanMalison";
-            repo = "coinbase-pro";
-            rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba";
-            sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq";
-          }) { };
-        });
-      });
-    };
+    overlay = import ./overlay.nix;
     overlays = taffybar.overlays ++ [ overlay ];
   in flake-utils.lib.eachDefaultSystem (system:
   let pkgs = import nixpkgs { inherit system overlays; config.allowBroken = true; };
   in
   rec {
     devShell = pkgs.haskellPackages.shellFor {
-      packages = p: [ p.imalison-taffybar ];
+      packages = p: [ p.imalison-taffybar p.taffybar ];
     };
     defaultPackage = pkgs.haskellPackages.imalison-taffybar;
   }) // { inherit overlay overlays; } ;
diff --git a/dotfiles/config/taffybar/overlay.nix b/dotfiles/config/taffybar/overlay.nix
new file mode 100644
index 00000000..3de900f3
--- /dev/null
+++ b/dotfiles/config/taffybar/overlay.nix
@@ -0,0 +1,19 @@
+final: prev: {
+  haskellPackages = prev.haskellPackages.override (old: {
+    overrides = prev.lib.composeExtensions (old.overrides or (_: _: {}))
+    (hself: hsuper: {
+      imalison-taffybar = hself.callCabal2nix "imalison-taffybar"
+      (
+        final.lib.sourceByRegex ./.
+        ["taffybar.hs" "imalison-taffybar.cabal"]
+      )
+      { };
+      coinbase-pro = hself.callCabal2nix "coinbase-pro" (final.fetchFromGitHub {
+        owner = "IvanMalison";
+        repo = "coinbase-pro";
+        rev = "8ac93b7905150c8cbd6957102a730ecceb8b4dba";
+        sha256 = "0v0xw593xczvvalh24bz37v2zbfz92dhz71f04m08abgphqmjvxq";
+      }) { };
+    });
+  });
+}
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 160358a8..6101475c 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -91,7 +91,7 @@ myConfig = def
   , logHook =
       updatePointer (0.5, 0.5) (0, 0) +++
       toggleFadeInactiveLogHook 0.9 +++ workspaceHistoryHook +++
-      setWorkspaceNames
+      setWorkspaceNames +++ activateLogHook (reader W.focusWindow >>= doF) <+> logHook def
   , handleEventHook =
       fullscreenEventHook +++ followIfNoMagicFocus +++ minimizeEventHook
   , startupHook = myStartup
diff --git a/nixos/appearance.nix b/nixos/appearance.nix
deleted file mode 100644
index 9cff6e51..00000000
--- a/nixos/appearance.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    # Appearance
-    gnome-breeze
-    gnome3.adwaita-icon-theme
-    hicolor-icon-theme
-    materia-theme
-    numix-icon-theme-circle
-    papirus-icon-theme
-  ];
-}
diff --git a/nixos/base.nix b/nixos/base.nix
index b4d32fb0..14b39c9a 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -8,7 +8,6 @@
 
   nixpkgs.overlays = [
     (import ../dotfiles/config/xmonad/overlay.nix)
-    (import ../dotfiles/config/taffybar/overlay.nix)
   ];
 
   # Allow all the things
@@ -41,8 +40,6 @@
     '';
   };
 
-  programs.zsh.enable = true;
-
   services.avahi = {
     enable = true;
     nssmdns = true;
@@ -74,6 +71,19 @@
   # TODO: Add a comment explaining what this does.
   services.gnome.at-spi2-core.enable = true;
 
+  # Shell configuration
+  programs.zsh = {
+    enable = true;
+    syntaxHighlighting = {
+      enable = true;
+    };
+    ohMyZsh = {
+      enable = true;
+      plugins = [ "git" "sudo" "pip" ];
+    };
+    spaceship-prompt.enable = true;
+  };
+
   services.openssh.enable = true;
 
   services.autorandr.enable = true;
diff --git a/nixos/essential.nix b/nixos/essential.nix
index def250bc..c91f9046 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -27,6 +27,8 @@ in
     element-desktop
 
     # Appearance
+    numix-icon-theme-circle
+    papirus-icon-theme
     hicolor-icon-theme
 
     # XOrg
diff --git a/nixos/flake.nix b/nixos/flake.nix
index fcb7a87f..ae207387 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -21,7 +21,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     taffybar = {
-      url = path:../dotfiles/config/taffybar;
+      url = path:../dotfiles/config/taffybar/taffybar;
       inputs.nixpkgs.follows = "nixpkgs";
     };
     notifications-tray-icon = {
@@ -41,7 +41,7 @@
     };
     nixpkgs.overlays = [
       nix.overlay xmonad.overlay xmonad-contrib.overlay
-      notifications-tray-icon.overlay
+      notifications-tray-icon.overlay (import ../dotfiles/config/taffybar/overlay.nix)
     ] ++ taffybar.overlays;
     imports = [
       home-manager.nixosModule
diff --git a/nixos/nixpkgs b/nixos/nixpkgs
index 8d947495..fe2bcc77 160000
--- a/nixos/nixpkgs
+++ b/nixos/nixpkgs
@@ -1 +1 @@
-Subproject commit 8d94749561763f58b8bdc3bc354d1803b1a31d31
+Subproject commit fe2bcc776a68b5d831c67cc78c6398729f8dca35