From 3a0d3fed99265617503236e573733cb5c27e7139 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 9 Dec 2022 04:42:09 +0100
Subject: =?UTF-8?q?tv:=20XMONAD=5FSPAWN=5FWORKSPACE=20=E2=86=92=20=5FCURRE?=
 =?UTF-8?q?NT=5FDESKTOP=5FNAME?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tv/2configs/bash/default.nix | 16 ++++++++++++++--
 tv/2configs/default.nix      |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'tv/2configs')

diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index c0855bb2..e38566b7 100644
--- a/tv/2configs/bash/default.nix
+++ b/tv/2configs/bash/default.nix
@@ -14,8 +14,20 @@ with import ./lib;
 
       case $UID in
         ${shell.escape (toString config.krebs.users.tv.uid)})
-          if test ''${SHLVL-1} = 1; then
-            case ''${XMONAD_SPAWN_WORKSPACE-} in
+          if test ''${SHLVL-1} = 1 && test -n "''${DISPLAY-}"; then
+            _CURRENT_DESKTOP_NAME=''${_CURRENT_DESKTOP_NAME-$(
+              ${pkgs.xorg.xprop}/bin/xprop -notype -root \
+                  32i _NET_CURRENT_DESKTOP \
+                  8s _NET_DESKTOP_NAMES \
+                |
+              ${pkgs.gnused}/bin/sed -r 's/.* = //;s/"//g;s/, /\a/g' |
+              {
+                read -r _NET_CURRENT_DESKTOP
+                IFS=$'\a' read -ra _NET_DESKTOP_NAMES
+                echo "''${_NET_DESKTOP_NAMES[$_NET_CURRENT_DESKTOP]}"
+              }
+            )}
+            case $_CURRENT_DESKTOP_NAME in
               stockholm)
                 cd ~/stockholm
               ;;
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 5710f28f..9babb92c 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -37,7 +37,7 @@ with import ./lib;
     {
       i18n.defaultLocale = mkDefault "C.UTF-8";
       security.sudo.extraConfig = ''
-        Defaults env_keep+="SSH_CLIENT XMONAD_SPAWN_WORKSPACE"
+        Defaults env_keep+="SSH_CLIENT _CURRENT_DESKTOP_NAME"
         Defaults mailto="${config.krebs.users.tv.mail}"
         Defaults !lecture
       '';
-- 
cgit v1.2.3