From 874cad02b1c78a7586a70cbbcd0cf7b38917d597 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 1 Dec 2020 16:12:01 -0800
Subject: [PATCH] WIP

---
 dotfiles/config/taffybar/base.nix    | 16 ++--------------
 dotfiles/config/taffybar/default.nix |  2 +-
 dotfiles/config/xmonad/base.nix      |  2 +-
 nixos/configuration.nix              |  8 +++++---
 4 files changed, 9 insertions(+), 19 deletions(-)

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..9a3f12b2 100644
--- a/dotfiles/config/taffybar/default.nix
+++ b/dotfiles/config/taffybar/default.nix
@@ -1 +1 @@
-(import ./base.nix).haskellPackages.imalison-taffybar
+(import ./base.nix).haskellPackages.imalison-taffybar (import ./taffybar/nixpkgs.nix)
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/nixos/configuration.nix b/nixos/configuration.nix
index 1e94d270..bff90a88 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -25,7 +25,9 @@ in
 {
   nixpkgs.overlays = [
     (import ./overlays.nix)
-    (import ../dotfiles/config/taffybar/taffybar/environment.nix)
+    (import ../dotfiles/config/taffybar/taffybar/overlay.nix)
+    (import ../dotfiles/config/xmonad/overlay.nix)
+    (import ../dotfiles/config/taffybar/overlay.nix)
   ];
 
   # Allow all the things
@@ -142,8 +144,8 @@ in
     plasma5.breeze-qt5
 
     # Haskell Desktop
-    (import ../dotfiles/config/taffybar/default.nix)
-    (import ../dotfiles/config/xmonad/default.nix)
+    haskellPackages.imalison-xmonad
+    haskellPackages.imalison-taffybar
     # notifications-tray-icon
     haskellPackages.status-notifier-item
     haskellPackages.xmonad