diff --git a/dotfiles/config/taffybar/imalison-taffybar.cabal b/dotfiles/config/taffybar/imalison-taffybar.cabal
index ffee62c9..85e71a14 100644
--- a/dotfiles/config/taffybar/imalison-taffybar.cabal
+++ b/dotfiles/config/taffybar/imalison-taffybar.cabal
@@ -18,7 +18,6 @@ executable taffybar
   build-depends:       base
                      , X11
                      , bytestring
-                     , coinbase-pro
                      , containers
                      , directory
                      , filepath
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 2f8b1aa7..945a0845 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 2f8b1aa745876846f67bc40504b5917157ccbec9
+Subproject commit 945a08452660de603193da8d297d559fdca497d1
diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad
index a4fbe5a5..90c71914 160000
--- a/dotfiles/config/xmonad/xmonad
+++ b/dotfiles/config/xmonad/xmonad
@@ -1 +1 @@
-Subproject commit a4fbe5a5557a51cb52a14593b0ca78154b086f91
+Subproject commit 90c719148b21db6d42a62889ea72d952a8317bee
diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib
index fab8e2de..9cdc5398 160000
--- a/dotfiles/config/xmonad/xmonad-contrib
+++ b/dotfiles/config/xmonad/xmonad-contrib
@@ -1 +1 @@
-Subproject commit fab8e2de73470b29e8d700f0820d44e397126521
+Subproject commit 9cdc5398e524b3a3fd7810198867e21b85b613a3
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 86a43f08..0711811c 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -760,7 +760,7 @@ setFocusedScreen :: ScreenId -> WindowSet -> WindowSet
 setFocusedScreen to ws =
   maybe ws (`setFocusedScreen'` ws) $ find ((to ==) . W.screen) (W.visible ws)
 
-setFocusedScreen' to ws @ W.StackSet
+setFocusedScreen' to ws@W.StackSet
   { W.current = prevCurr
   , W.visible = visible
   } = ws { W.current = to
@@ -769,7 +769,7 @@ setFocusedScreen' to ws @ W.StackSet
 
   where screenEq a b = W.screen a == W.screen b
 
-nextScreen ws @ W.StackSet { W.visible = visible } =
+nextScreen ws@W.StackSet { W.visible = visible } =
   case visible of
     next:_ -> setFocusedScreen (W.screen next) ws
     _ -> ws
diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org
index 33b82f63..926d8308 100644
--- a/dotfiles/emacs.d/README.org
+++ b/dotfiles/emacs.d/README.org
@@ -3907,15 +3907,6 @@ I've disabled magithub because it causes magit to be super slow
       (interactive)
       (gitolite-clone-get-projects nil nil t))))
 #+END_SRC
-** gitconfig-mode
-#+BEGIN_SRC emacs-lisp
-(use-package gitconfig-mode
-  :mode "\\.?gitconfig.?.*\\'")
-#+END_SRC
-** gitignore-mode
-#+BEGIN_SRC emacs-lisp
-(use-package gitignore-mode
-  :mode "\\.?gitignore.?.*\\'")
 #+END_SRC
 ** github
 *** github-search
diff --git a/nixos/all.nix b/nixos/all.nix
index cfdfc967..e0758fa9 100644
--- a/nixos/all.nix
+++ b/nixos/all.nix
@@ -32,7 +32,7 @@
     zoom-us
 
     # Appearance
-    gnome-breeze
+    libsForQt5.breeze-gtk
     gnome3.adwaita-icon-theme
     hicolor-icon-theme
     materia-theme
@@ -79,8 +79,6 @@
     pavucontrol
     playerctl
 
-
-
     # Tools
     automake
     bind
@@ -89,7 +87,6 @@
     dex
     direnv
     dpkg
-    emacs27Packages.cask
     fd
     file
     gcc
diff --git a/nixos/base.nix b/nixos/base.nix
index 9fd097f2..ecee9de6 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -32,6 +32,7 @@
   # Disabling these waits disables the stuck on boot up issue
   systemd.services.systemd-udev-settle.enable = false;
   systemd.services.NetworkManager-wait-online.enable = false;
+  systemd.services.systemd-user-sessions.enable = false;
 
   # Security
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
@@ -46,7 +47,7 @@
   networking.networkmanager = {
     enable = true;
     enableStrongSwan = true;
-    packages = [ pkgs.networkmanager-l2tp ];
+    plugins = [ pkgs.networkmanager-l2tp ];
     extraConfig = ''
       [main]
       rc-manager=resolvconf
diff --git a/nixos/essential.nix b/nixos/essential.nix
index 57d2065b..a42f5755 100644
--- a/nixos/essential.nix
+++ b/nixos/essential.nix
@@ -18,6 +18,7 @@ in
   nixpkgs.overlays = [
     (import ../dotfiles/config/xmonad/overlay.nix)
   ];
+  nixpkgs.config.allowBroken = true;
   environment.systemPackages = with pkgs; [
     python-with-my-packages
 
diff --git a/nixos/home-manager b/nixos/home-manager
index 9580f6c4..e66f0ff6 160000
--- a/nixos/home-manager
+++ b/nixos/home-manager
@@ -1 +1 @@
-Subproject commit 9580f6c42af2535dc7890edb681ead090f5105f2
+Subproject commit e66f0ff69a6c0698b35034b842c4b68814440778
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index f1e1793c..1b03d996 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -55,7 +55,7 @@
 
   services.random-background = {
     enable = true;
-    display = "scale";
+    display = "center";
     interval = "1h";
     imageDirectory = "%h/Pictures/wallpaper/use";
   };
diff --git a/nixos/nixpkgs b/nixos/nixpkgs
index 778f7cea..78bb57e8 160000
--- a/nixos/nixpkgs
+++ b/nixos/nixpkgs
@@ -1 +1 @@
-Subproject commit 778f7cea96f3227d7bdb8e1b63ecf7afaac50d24
+Subproject commit 78bb57e8f79248989c940c49d39bf47a72ae7b5a