[NixOS] Fix taffybar overlay

dotfiles/config/taffybar/flake.nix

@@ -2,26 +2,10 @@
   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: {
+    overlay = import ./overlay.nix;
-      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";
-          }) { };
-        });
-      });
-    };
     overlays = taffybar.overlays ++ [ overlay ];
   in flake-utils.lib.eachDefaultSystem (system:
   let pkgs = import nixpkgs { inherit system overlays; config.allowBroken = true; };

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";
+      }) { };
+    });
+  });
+}

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