From bcaf3771d9503f1b0d01a2c15ca0712ee454342f Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Thu, 29 Oct 2015 01:49:27 +0100
Subject: [PATCH] tv: {2configs/xserver => 5pkgs}/xmonad-tv

---
 tv/2configs/xserver/default.nix                            | 7 ++-----
 tv/5pkgs/default.nix                                       | 3 +++
 tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/.gitignore | 0
 tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Main.hs    | 0
 tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Makefile   | 0
 .../xserver/xmonad => 5pkgs/xmonad-tv}/Util/Font.hs        | 0
 .../xserver/xmonad => 5pkgs/xmonad-tv}/Util/Pager.hs       | 0
 .../xserver/xmonad => 5pkgs/xmonad-tv}/Util/Rhombus.hs     | 0
 .../xserver/xmonad => 5pkgs/xmonad-tv}/Util/Shutdown.hs    | 0
 .../xserver/xmonad => 5pkgs/xmonad-tv}/Util/Submap.hs      | 0
 .../xserver/xmonad => 5pkgs/xmonad-tv}/Util/XUtils.hs      | 0
 .../xserver/xmonad => 5pkgs/xmonad-tv}/xmonad.cabal        | 0
 12 files changed, 5 insertions(+), 5 deletions(-)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/.gitignore (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Main.hs (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Makefile (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Util/Font.hs (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Util/Pager.hs (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Util/Rhombus.hs (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Util/Shutdown.hs (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Util/Submap.hs (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/Util/XUtils.hs (100%)
 rename tv/{2configs/xserver/xmonad => 5pkgs/xmonad-tv}/xmonad.cabal (100%)

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
similarity index 100%
rename from tv/2configs/xserver/xmonad/.gitignore
rename to tv/5pkgs/xmonad-tv/.gitignore
diff --git a/tv/2configs/xserver/xmonad/Main.hs b/tv/5pkgs/xmonad-tv/Main.hs
similarity index 100%
rename from tv/2configs/xserver/xmonad/Main.hs
rename to tv/5pkgs/xmonad-tv/Main.hs
diff --git a/tv/2configs/xserver/xmonad/Makefile b/tv/5pkgs/xmonad-tv/Makefile
similarity index 100%
rename from tv/2configs/xserver/xmonad/Makefile
rename to tv/5pkgs/xmonad-tv/Makefile
diff --git a/tv/2configs/xserver/xmonad/Util/Font.hs b/tv/5pkgs/xmonad-tv/Util/Font.hs
similarity index 100%
rename from tv/2configs/xserver/xmonad/Util/Font.hs
rename to 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
similarity index 100%
rename from tv/2configs/xserver/xmonad/Util/Pager.hs
rename to 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
similarity index 100%
rename from tv/2configs/xserver/xmonad/Util/Rhombus.hs
rename to 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
similarity index 100%
rename from tv/2configs/xserver/xmonad/Util/Shutdown.hs
rename to 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
similarity index 100%
rename from tv/2configs/xserver/xmonad/Util/Submap.hs
rename to 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
similarity index 100%
rename from tv/2configs/xserver/xmonad/Util/XUtils.hs
rename to tv/5pkgs/xmonad-tv/Util/XUtils.hs
diff --git a/tv/2configs/xserver/xmonad/xmonad.cabal b/tv/5pkgs/xmonad-tv/xmonad.cabal
similarity index 100%
rename from tv/2configs/xserver/xmonad/xmonad.cabal
rename to tv/5pkgs/xmonad-tv/xmonad.cabal