tv: {2configs/xserver => 5pkgs}/xmonad-tv

12 files changed, 5 insertions, 5 deletions

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 388a33bbe..4d2fe9e45 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -80,9 +80,6 @@ let
     '';
   };
 
-  xmonad-pkg = pkgs.haskellPackages.callPackage xmonad-src {};
-  xmonad-src = pkgs.writeNixFromCabal "xmonad.nix" ./xmonad;
-
   xmonad-environment = {
     DISPLAY = ":${toString config.services.xserver.display}";
     XMONAD_STATE = "/tmp/xmonad.state";
@@ -119,12 +116,12 @@ let
     settle ${pkgs.xorg.xhost}/bin/xhost +LOCAL:
     settle ${pkgs.xorg.xrdb}/bin/xrdb -merge ${import ./Xresources.nix args}
     settle ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c'
-    exec ${xmonad-pkg}/bin/xmonad
+    exec ${pkgs.xmonad-tv}/bin/xmonad
   '';
 
   xmonad-stop = pkgs.writeScriptBin "xmonad-stop" ''
     #! /bin/sh
-    exec ${xmonad-pkg}/bin/xmonad --shutdown
+    exec ${pkgs.xmonad-tv}/bin/xmonad --shutdown
   '';
 
   xserver-environment = {
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 3cfa8f863..1ca5e70a2 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -3,4 +3,7 @@
 {
   ff = pkgs.callPackage ./ff {};
   viljetic-pages = pkgs.callPackage ./viljetic-pages {};
+  xmonad-tv =
+    let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in
+    pkgs.haskellPackages.callPackage src {};
 }
diff --git a/tv/2configs/xserver/xmonad/.gitignore b/tv/5pkgs/xmonad-tv/.gitignore
index 616204547..616204547 100644
--- a/tv/2configs/xserver/xmonad/.gitignore
+++ b/tv/5pkgs/xmonad-tv/.gitignore
diff --git a/tv/2configs/xserver/xmonad/Main.hs b/tv/5pkgs/xmonad-tv/Main.hs
index 2cc48efa3..2cc48efa3 100644
--- a/tv/2configs/xserver/xmonad/Main.hs
+++ b/tv/5pkgs/xmonad-tv/Main.hs
diff --git a/tv/2configs/xserver/xmonad/Makefile b/tv/5pkgs/xmonad-tv/Makefile
index cbb0776e6..cbb0776e6 100644
--- a/tv/2configs/xserver/xmonad/Makefile
+++ b/tv/5pkgs/xmonad-tv/Makefile
diff --git a/tv/2configs/xserver/xmonad/Util/Font.hs b/tv/5pkgs/xmonad-tv/Util/Font.hs
index 5352cf5ad..5352cf5ad 100644
--- a/tv/2configs/xserver/xmonad/Util/Font.hs
+++ b/tv/5pkgs/xmonad-tv/Util/Font.hs
diff --git a/tv/2configs/xserver/xmonad/Util/Pager.hs b/tv/5pkgs/xmonad-tv/Util/Pager.hs
index b8168b5b0..b8168b5b0 100644
--- a/tv/2configs/xserver/xmonad/Util/Pager.hs
+++ b/tv/5pkgs/xmonad-tv/Util/Pager.hs
diff --git a/tv/2configs/xserver/xmonad/Util/Rhombus.hs b/tv/5pkgs/xmonad-tv/Util/Rhombus.hs
index 9d46e4127..9d46e4127 100644
--- a/tv/2configs/xserver/xmonad/Util/Rhombus.hs
+++ b/tv/5pkgs/xmonad-tv/Util/Rhombus.hs
diff --git a/tv/2configs/xserver/xmonad/Util/Shutdown.hs b/tv/5pkgs/xmonad-tv/Util/Shutdown.hs
index 89e22b4e7..89e22b4e7 100644
--- a/tv/2configs/xserver/xmonad/Util/Shutdown.hs
+++ b/tv/5pkgs/xmonad-tv/Util/Shutdown.hs
diff --git a/tv/2configs/xserver/xmonad/Util/Submap.hs b/tv/5pkgs/xmonad-tv/Util/Submap.hs
index b09b97cc2..b09b97cc2 100644
--- a/tv/2configs/xserver/xmonad/Util/Submap.hs
+++ b/tv/5pkgs/xmonad-tv/Util/Submap.hs
diff --git a/tv/2configs/xserver/xmonad/Util/XUtils.hs b/tv/5pkgs/xmonad-tv/Util/XUtils.hs
index de1d8247c..de1d8247c 100644
--- a/tv/2configs/xserver/xmonad/Util/XUtils.hs
+++ b/tv/5pkgs/xmonad-tv/Util/XUtils.hs
diff --git a/tv/2configs/xserver/xmonad/xmonad.cabal b/tv/5pkgs/xmonad-tv/xmonad.cabal
index cc72d3953..cc72d3953 100644
--- a/tv/2configs/xserver/xmonad/xmonad.cabal
+++ b/tv/5pkgs/xmonad-tv/xmonad.cabal