diff --git a/.gitignore b/.gitignore
index a1efb0e8..1b1a3663 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@
 gotools
 /dotfiles/config/xmonad/result
 /dotfiles/config/taffybar/result
+/dotfiles/emacs.d/*.sqlite
diff --git a/dotfiles/config/picom.conf b/dotfiles/config/picom.conf
index 6126532f..e860addc 100644
--- a/dotfiles/config/picom.conf
+++ b/dotfiles/config/picom.conf
@@ -112,7 +112,6 @@ inactive-opacity = 1;
 active-opacity = 1;
 frame-opacity = 1;
 inactive-opacity-override = false;
-alpha-step = 0.06;
 
 # Dim inactive windows. (0.0 - 1.0)
 # inactive-dim = 0.2;
@@ -190,8 +189,6 @@ vsync = "opengl";
 # Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing.
 # Reported to have no effect, though.
 dbe = false;
-# Painting on X Composite overlay window. Recommended.
-paint-on-overlay = true;
 
 # Limit compton to repaint at most once every 1 / refresh_rate second to boost performance.
 # This should not be used with --vsync drm/opengl/opengl-oml as they essentially does --sw-opti's job already,
diff --git a/dotfiles/config/taffybar/base.nix b/dotfiles/config/taffybar/base.nix
index 73bebeac..85b7a2c3 100644
--- a/dotfiles/config/taffybar/base.nix
+++ b/dotfiles/config/taffybar/base.nix
@@ -1,19 +1,7 @@
-(import ./taffybar/nixpkgs.nix) {
+pkgs: pkgs {
   overlays = [
     (import ./taffybar/overlay.nix)
     (import ../xmonad/overlay.nix)
-    (_: super: {
-      haskellPackages = super.haskellPackages.override (old: {
-        overrides = super.lib.composeExtensions (old.overrides or (_: _: {})) (self: _: {
-          imalison-taffybar =
-            self.callCabal2nix "imalison-taffybar"
-            (
-              super.lib.sourceByRegex ./.
-              ["taffybar.hs" "imalison-taffybar.cabal"]
-            )
-            { };
-        });
-      });
-    })
+    (import ./overlay.nix)
   ];
 }
diff --git a/dotfiles/config/taffybar/default.nix b/dotfiles/config/taffybar/default.nix
index 922dacbd..be1a111c 100644
--- a/dotfiles/config/taffybar/default.nix
+++ b/dotfiles/config/taffybar/default.nix
@@ -1 +1,3 @@
-(import ./base.nix).haskellPackages.imalison-taffybar
+let pkgs = ((import ./base.nix) (import <nixpkgs>)) ;
+in
+pkgs.haskellPackages.imalison-taffybar
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 104a1c12..c8fe1a41 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 104a1c12f722f362ccb60794119de95f96f18ea8
+Subproject commit c8fe1a41497c2b68ba6c15404125afa7de283e86
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index e2599a8e..a69b9d26 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -136,7 +136,7 @@ main = do
         { underlineHeight = 3
         , underlinePadding = 2
         , minIcons = 1
-        , getWindowIconPixbuf = scaledWindowIconPixbufGetter getWindowIconPixbufFromEWMH
+        , getWindowIconPixbuf = myIcons
         , widgetGap = 0
         , showWorkspaceFn = hideEmpty
         , updateRateLimitMicroseconds = 100000
@@ -197,6 +197,9 @@ main = do
           , ( "imalison-home"
             , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 }
             )
+          , ( "ryzen-shine"
+            , baseConfig { endWidgets = fullEndWidgets, barHeight = 42 }
+            )
           , ( "ivanm-dfinity-razer"
             , baseConfig { endWidgets = shortLaptopEndWidgets, barHeight = 42 }
             )
diff --git a/dotfiles/config/xmonad/base.nix b/dotfiles/config/xmonad/base.nix
index f90655da..16fe3fbd 100644
--- a/dotfiles/config/xmonad/base.nix
+++ b/dotfiles/config/xmonad/base.nix
@@ -1,4 +1,4 @@
-(import ../taffybar/taffybar/nixpkgs.nix) {
+pkgs: pkgs {
   overlays = [
     (import ../taffybar/taffybar/overlay.nix)
     (import ./overlay.nix)
diff --git a/dotfiles/config/xmonad/xmonad b/dotfiles/config/xmonad/xmonad
index bb138539..5be975b4 160000
--- a/dotfiles/config/xmonad/xmonad
+++ b/dotfiles/config/xmonad/xmonad
@@ -1 +1 @@
-Subproject commit bb13853929f8f6fc59b526bcc10631e1bac309ad
+Subproject commit 5be975b4f23abe851ab59866f572d3301cb0119a
diff --git a/dotfiles/config/xmonad/xmonad-contrib b/dotfiles/config/xmonad/xmonad-contrib
index 509fe0d4..92617ebc 160000
--- a/dotfiles/config/xmonad/xmonad-contrib
+++ b/dotfiles/config/xmonad/xmonad-contrib
@@ -1 +1 @@
-Subproject commit 509fe0d459b85a485a84f231ad0b4ed0b60d8bfd
+Subproject commit 92617ebc09a4b989e7d6353d8f1783994afa8939
diff --git a/dotfiles/config/xmonad/xmonad.hs b/dotfiles/config/xmonad/xmonad.hs
index 7d00da69..7bccc72a 100644
--- a/dotfiles/config/xmonad/xmonad.hs
+++ b/dotfiles/config/xmonad/xmonad.hs
@@ -398,8 +398,7 @@ getClass w = fromMaybe <$> getClassRaw w <*> getVirtualClass w
 
 desktopEntriesMap :: MM.MultiMap String DesktopEntry
 desktopEntriesMap =
-  unsafePerformIO $ do
-    tee id (>>= writeToHomeDirLog . show . MM.keys) $
+  unsafePerformIO $
         indexDesktopEntriesByClassName <$> getDirectoryEntriesDefault
 
 lookupIconFromClasses classes =
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 041c237b..0f98c4dd 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -25,6 +25,9 @@ in
 {
   nixpkgs.overlays = [
     (import ./overlays.nix)
+    (import ../dotfiles/config/taffybar/taffybar/overlay.nix)
+    (import ../dotfiles/config/xmonad/overlay.nix)
+    (import ../dotfiles/config/taffybar/overlay.nix)
   ];
 
   # Allow all the things
@@ -140,6 +143,14 @@ in
     plasma5.breeze-gtk
     plasma5.breeze-qt5
 
+    # Haskell Desktop
+    haskellPackages.imalison-xmonad
+    haskellPackages.imalison-taffybar
+    # notifications-tray-icon
+    haskellPackages.status-notifier-item
+    haskellPackages.xmonad
+    haskellPackages.dbus-hslogger
+
     # Desktop
     autorandr
     betterlockscreen