From 73a63312255821f2b3b0315232cdd5b8ea1b994d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 25 May 2016 01:37:52 +0200
Subject: xmonad-tv: startupHook = $XMONAD_STARTUP_HOOK &

---
 tv/2configs/xserver/default.nix | 35 ++++++++++-------------------------
 tv/5pkgs/xmonad-tv.nix          |  4 +++-
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 51e243284..efc06be14 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -56,8 +56,8 @@ let
       requires = [ "xserver.service" ];
       environment = xmonad-environment;
       serviceConfig = {
-        ExecStart = "${xmonad-start}/bin/xmonad";
-        ExecStop = "${xmonad-stop}/bin/xmonad-stop";
+        ExecStart = "${pkgs.xmonad-tv}/bin/xmonad-tv";
+        ExecStop = "${pkgs.xmonad-tv}/bin/xmonad-tv --shutdown";
         User = user.name;
         WorkingDirectory = user.home;
       };
@@ -80,6 +80,14 @@ let
 
   xmonad-environment = {
     DISPLAY = ":${toString config.services.xserver.display}";
+
+    XMONAD_STARTUP_HOOK = pkgs.writeDash "xmonad-startup-hook" ''
+      ${pkgs.xorg.xhost}/bin/xhost +LOCAL: &
+      ${pkgs.xorg.xrdb}/bin/xrdb -merge ${import ./Xresources.nix args} &
+      ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
+      wait
+    '';
+
     XMONAD_STATE = "/tmp/xmonad.state";
 
     # XXX JSON is close enough :)
@@ -96,29 +104,6 @@ let
     ]);
   };
 
-  xmonad-start = pkgs.writeScriptBin "xmonad" ''
-    #! ${pkgs.bash}/bin/bash
-    set -efu
-    settle() {(
-      # Use PATH for a clean journal
-      command=''${1##*/}
-      PATH=''${1%/*}; export PATH
-      shift
-      until "$command" "$@"; do
-        ${pkgs.coreutils}/bin/sleep 1
-      done
-    )&}
-    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 ${pkgs.xmonad-tv}/bin/xmonad-tv
-  '';
-
-  xmonad-stop = pkgs.writeScriptBin "xmonad-stop" ''
-    #! /bin/sh
-    exec ${pkgs.xmonad-tv}/bin/xmonad-tv --shutdown
-  '';
-
   xserver-environment = {
     XKB_BINDIR = "${pkgs.xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
     XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
diff --git a/tv/5pkgs/xmonad-tv.nix b/tv/5pkgs/xmonad-tv.nix
index 794d90688..74e43dc79 100644
--- a/tv/5pkgs/xmonad-tv.nix
+++ b/tv/5pkgs/xmonad-tv.nix
@@ -83,7 +83,9 @@ mainNoArgs = do
             -- , handleEventHook   = myHandleEventHooks <+> handleTimerEvent
             --, handleEventHook   = handleTimerEvent
             , manageHook        = placeHook (smart (1,0)) <+> floatNextHook
-            , startupHook       = liftIO (putStrLn "emit XMonadStartup")
+            , startupHook = do
+                path <- liftIO (getEnv "XMONAD_STARTUP_HOOK")
+                forkFile path [] Nothing
             , normalBorderColor  = "#1c1c1c"
             , focusedBorderColor = "#f000b0"
             , handleEventHook = handleShutdownEvent
-- 
cgit v1.2.3