From b611d8a1e2c6b4c0adf078b4c84ebe0fe10df93a Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 10 Jun 2019 14:53:41 -0700
Subject: [PATCH] Add taffybar shell nix files

---
 dotfiles/config/taffybar/cabal.project           | 1 +
 dotfiles/config/taffybar/imalison-taffybar.cabal | 2 --
 dotfiles/config/taffybar/shell.nix               | 7 +++++++
 dotfiles/config/taffybar/taffybar                | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 dotfiles/config/taffybar/cabal.project
 create mode 100644 dotfiles/config/taffybar/shell.nix

diff --git a/dotfiles/config/taffybar/cabal.project b/dotfiles/config/taffybar/cabal.project
new file mode 100644
index 00000000..a066d60c
--- /dev/null
+++ b/dotfiles/config/taffybar/cabal.project
@@ -0,0 +1 @@
+packages: . taffybar/
diff --git a/dotfiles/config/taffybar/imalison-taffybar.cabal b/dotfiles/config/taffybar/imalison-taffybar.cabal
index b555f3bc..4545bae1 100644
--- a/dotfiles/config/taffybar/imalison-taffybar.cabal
+++ b/dotfiles/config/taffybar/imalison-taffybar.cabal
@@ -33,8 +33,6 @@ executable imalison-taffybar
                      , taffybar>=3.2.0
                      , transformers
                      , xdg-basedir
-                     , xmonad-contrib>=0.13
-                     , xmonad>=0.13
   default-language:    Haskell2010
 
 source-repository head
diff --git a/dotfiles/config/taffybar/shell.nix b/dotfiles/config/taffybar/shell.nix
new file mode 100644
index 00000000..aae7a934
--- /dev/null
+++ b/dotfiles/config/taffybar/shell.nix
@@ -0,0 +1,7 @@
+let
+  pkgs = import <nixpkgs> { overlays = [
+    (import ./taffybar/overlay.nix) (import ../xmonad/overlay.nix)
+  ]; };
+  source = pkgs.lib.sourceByRegex ./. ["taffybar.hs" "imalison-taffybar.cabal"];
+  imalison-taffybar = pkgs.haskellPackages.callCabal2nix "imalison-taffybar" source { };
+in pkgs.haskellPackages.shellFor { packages = _: [imalison-taffybar pkgs.haskellPackages.taffybar]; }
diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index c1a5c9a0..cb09a5d1 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit c1a5c9a0f063251b4088f484b5dafdac85d32937
+Subproject commit cb09a5d1c5ee7af55c627175373fb1ea469d651e