From 39b6738c66887d6234d274f5b8d9fba65f4be959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukpank@o2.pl>
Date: Sat, 29 Jul 2023 11:47:47 +0200
Subject: [PATCH] caps:escape, dwm before xmonad, no emacs in bg

---
 xsession/.xsession | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/xsession/.xsession b/xsession/.xsession
index f6f3e33..68b7c91 100755
--- a/xsession/.xsession
+++ b/xsession/.xsession
@@ -8,7 +8,7 @@ xset b off
 xrandr --auto
 xrandr --output HDMI1 --right-of DP1
 xrdb -merge ~/.Xresources
-setxkbmap pl -option ctrl:nocaps
+setxkbmap pl -option caps:escape
 xmodmap ~/.xmodmaprc
 
 if [ -x  ~/.fehbg ]; then
@@ -24,24 +24,26 @@ else
     ( echo "Missing command(s):"; which xss-lock slock 2>&1 ) | xmessage -file -
 fi
 
-# run emacs daemon if not running
-emacsclient --eval nil -a '' &
-
 xsettingsd &
 
 xsetroot -cursor_name left_ptr
 
 picom -b -I 1 -O 1 -i 1 -e 1 --no-fading-openclose || compton -b --no-fading-openclose
 
-if which xmonad > /dev/null && test -f ~/.stumpwm.d/init.lisp; then
-   export SBCL_HOME="$(dirname $(dirname $(readlink -f $(which sbcl))))/lib/sbcl/"
-   exec stumpwm
+if which dwm > /dev/null; then
+    lupan-clock &
+    exec dwm
 fi
 
 if which xmonad > /dev/null && test -f ~/.config/xmonad/xmonad.hs; then
     exec xmonad
 fi
 
+if which stumpwm > /dev/null && test -f ~/.stumpwm.d/init.lisp; then
+   export SBCL_HOME="$(dirname $(dirname $(readlink -f $(which sbcl))))/lib/sbcl/"
+   exec stumpwm
+fi
+
 if which qtile > /dev/null && test -f ~/.config/qtile/config.py; then
     exec qtile start
 fi
@@ -65,9 +67,4 @@ if which i3 > /dev/null; then
     exec i3
 fi
 
-if which dwm > /dev/null; then
-    lupan-clock &
-    exec dwm
-fi
-
 exec xterm