From e8e0a68029516b3577aef5aabf818589009f334d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 3 Dec 2018 22:48:11 +0100
Subject: tv xmonad shell: prevent double yield

---
 tv/5pkgs/haskell/xmonad-tv/shell.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'tv')

diff --git a/tv/5pkgs/haskell/xmonad-tv/shell.nix b/tv/5pkgs/haskell/xmonad-tv/shell.nix
index 936e69627..6ca00bc05 100644
--- a/tv/5pkgs/haskell/xmonad-tv/shell.nix
+++ b/tv/5pkgs/haskell/xmonad-tv/shell.nix
@@ -46,7 +46,7 @@ in
       xmonad_restart() {(
         set -efu
         cd "$WORKDIR"
-        if systemctl is-active xmonad; then
+        if systemctl --quiet is-active xmonad; then
           sudo systemctl stop xmonad
           cp -b "$config_XMONAD_CACHE_DIR"/xmonad.state "$CACHEDIR"/
           echo "xmonad.state: $(cat "$CACHEDIR"/xmonad.state)"
@@ -59,9 +59,14 @@ in
 
       xmonad_yield() {(
         set -efu
-        "$xmonad" --shutdown
-        cp -b "$CACHEDIR"/xmonad.state "$config_XMONAD_CACHE_DIR"/
-        sudo systemctl start xmonad
+        if ! systemctl --quiet is-active xmonad; then
+          "$xmonad" --shutdown
+          cp -b "$CACHEDIR"/xmonad.state "$config_XMONAD_CACHE_DIR"/
+          sudo systemctl start xmonad
+        else
+          echo "xmonad.service is already running" >&2
+          exit -1
+        fi
       )}
 
       export PATH=${config.systemd.services.xmonad.path}:$PATH
-- 
cgit v1.2.3


From bfcf6ad0adaedf0d069850824fbbb55e4af20c5e Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 6 Dec 2018 22:12:50 +0100
Subject: tv xserver: xhost +SI:localuser:tv -LOCAL:

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

(limited to 'tv')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 8d4b13fad..1c0516651 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -64,7 +64,10 @@ in {
       XMONAD_DATA_DIR = cfg.dataDir;
 
       XMONAD_STARTUP_HOOK = pkgs.writeDash "xmonad-startup-hook" ''
-        ${pkgs.xorg.xhost}/bin/xhost +LOCAL: &
+        {
+          ${pkgs.xorg.xhost}/bin/xhost +SI:localuser:${cfg.user.name}
+          ${pkgs.xorg.xhost}/bin/xhost -LOCAL:
+        } &
         ${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
         ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
         ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
-- 
cgit v1.2.3


From 761ce9cefdb2c04132f44c2b41fac6d49a472752 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 9 Dec 2018 10:14:09 +0100
Subject: tv xmonad: cleanup service definition

---
 tv/2configs/xserver/default.nix | 45 +++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 1c0516651..f68e8e681 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/2configs/xserver/default.nix
@@ -48,34 +48,35 @@ in {
 
   systemd.services.xmonad = let
     xmonad = "${pkgs.haskellPackages.xmonad-tv}/bin/xmonad";
+    xmonad-prepare = pkgs.writeDash "xmonad-prepare" ''
+      ${pkgs.coreutils}/bin/mkdir -p "$XMONAD_CACHE_DIR"
+      ${pkgs.coreutils}/bin/mkdir -p "$XMONAD_CONFIG_DIR"
+      ${pkgs.coreutils}/bin/mkdir -p "$XMONAD_DATA_DIR"
+    '';
+    xmonad-ready = pkgs.writeDash "xmonad-ready" ''
+      {
+        ${pkgs.xorg.xhost}/bin/xhost +SI:localuser:${cfg.user.name}
+        ${pkgs.xorg.xhost}/bin/xhost -LOCAL:
+      } &
+      ${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
+      ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
+      ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
+      wait
+    '';
   in {
     wantedBy = [ "graphical.target" ];
     requires = [ "xserver.service" ];
     environment = {
       DISPLAY = ":${toString config.services.xserver.display}";
-
       FZMENU_FZF_DEFAULT_OPTS = toString [
         "--color=dark,border:126,bg+:090"
         "--inline-info"
       ];
-
       XMONAD_CACHE_DIR = cfg.cacheDir;
       XMONAD_CONFIG_DIR = cfg.configDir;
       XMONAD_DATA_DIR = cfg.dataDir;
-
-      XMONAD_STARTUP_HOOK = pkgs.writeDash "xmonad-startup-hook" ''
-        {
-          ${pkgs.xorg.xhost}/bin/xhost +SI:localuser:${cfg.user.name}
-          ${pkgs.xorg.xhost}/bin/xhost -LOCAL:
-        } &
-        ${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
-        ${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
-        ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
-        wait
-      '';
-
-      # XXX JSON is close enough :)
-      XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [
+      XMONAD_STARTUP_HOOK = xmonad-ready;
+      XMONAD_WORKSPACES0_FILE = pkgs.writeJSON "xmonad-workspaces0.json" [
         "Dashboard" # we start here
         "23"
         "cr"
@@ -85,7 +86,7 @@ in {
         "mail"
         "stockholm"
         "za" "zh" "zj" "zs"
-      ]);
+      ];
     };
     path = [
       config.tv.slock.package
@@ -96,14 +97,10 @@ in {
       "/run/wrappers" # for su
     ];
     serviceConfig = {
-      SyslogIdentifier = "xmonad";
-      ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${toString [
-        "\${XMONAD_CACHE_DIR}"
-        "\${XMONAD_CONFIG_DIR}"
-        "\${XMONAD_DATA_DIR}"
-      ]}";
-      ExecStart = "@${xmonad} xmonad-${currentSystem} ";
+      ExecStartPre = "@${xmonad-prepare} xmonad-prepare";
+      ExecStart = "@${xmonad} xmonad-${currentSystem}";
       ExecStop = "@${xmonad} xmonad-${currentSystem} --shutdown";
+      SyslogIdentifier = "xmonad";
       User = cfg.user.name;
       WorkingDirectory = cfg.user.home;
     };
-- 
cgit v1.2.3