From c82942bb7b872765d109d5cc5fccec5f945f1200 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 9 Dec 2022 01:31:56 +0100
Subject: tv: normalize lib imports

---
 tv/2configs/bash/default.nix | 7 ++-----
 tv/2configs/bash/lib         | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 120000 tv/2configs/bash/lib

(limited to 'tv/2configs/bash')

diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index 92e2499..c0855bb 100644
--- a/tv/2configs/bash/default.nix
+++ b/tv/2configs/bash/default.nix
@@ -1,8 +1,5 @@
-{ config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
-
-{
+with import ./lib;
+{ config, pkgs, ... }: {
   programs.bash = {
     interactiveShellInit = /* sh */ ''
       HISTCONTROL='erasedups:ignorespace'
diff --git a/tv/2configs/bash/lib b/tv/2configs/bash/lib
new file mode 120000
index 0000000..dc598c5
--- /dev/null
+++ b/tv/2configs/bash/lib
@@ -0,0 +1 @@
+../lib
\ No newline at end of file
-- 
cgit v1.2.3


From be9274b6c2b213c376bf9f0efeefb6275d0224fd 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 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'tv/2configs/bash')

diff --git a/tv/2configs/bash/default.nix b/tv/2configs/bash/default.nix
index c0855bb..e38566b 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
               ;;
-- 
cgit v1.2.3