From 4e7a5a107f18037d126120fe0f59c6b80658bd46 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 26 Oct 2015 11:27:24 +0100
Subject: tv xmonad.workspaces0 += zh

---
 tv/2configs/xserver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index c5cffbb3..26575106 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -89,7 +89,7 @@ let
       "im"
       "mail"
       "stockholm"
-      "za" "zj" "zs"
+      "za" "zh" "zj" "zs"
     ]);
   };
 
-- 
cgit v1.2.3


From 877f2b6c6bc8c7721588638836fb1288cc3f7f80 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Mon, 26 Oct 2015 11:31:40 +0100
Subject: tv xserver bash: sudo per XMONAD_SPAWN_WORKSPACE

---
 tv/2configs/xserver/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 26575106..3ea5cec9 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -70,6 +70,14 @@ let
         ExecStart = "${xserver}/bin/xserver";
       };
     };
+
+    programs.bash.interactiveShellInit = ''
+      case ''${XMONAD_SPAWN_WORKSPACE-} in
+        za|zh|zj|zs)
+          exec sudo -u zalora -i
+        ;;
+      esac
+    '';
   };
 
   xmonad-pkg = pkgs.haskellPackages.callPackage xmonad-src {};
-- 
cgit v1.2.3


From 057c4836c10eebf3141d7b20a9e942518357606c Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Wed, 28 Oct 2015 21:00:29 +0100
Subject: tv xmonad: resume by reading state from file

---
 tv/2configs/xserver/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 3ea5cec9..388a33bb 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -119,12 +119,7 @@ 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'
-    if test -e "$XMONAD_STATE"; then
-      IFS=''$'\n'
-      exec ${xmonad-pkg}/bin/xmonad --resume $(< "$XMONAD_STATE")
-    else
-      exec ${xmonad-pkg}/bin/xmonad
-    fi
+    exec ${xmonad-pkg}/bin/xmonad
   '';
 
   xmonad-stop = pkgs.writeScriptBin "xmonad-stop" ''
-- 
cgit v1.2.3


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

---
 tv/2configs/xserver/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'tv/2configs/xserver/default.nix')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 388a33bb..4d2fe9e4 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 = {
-- 
cgit v1.2.3