From 39c149d9f0bef296bfd832ded1229a5d070b1491 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Sun, 22 May 2022 21:43:08 +0930
Subject: [PATCH] updates to work with login manager, let's test on other
 machine

---
 .config/shell/profile |  8 ++++++--
 .config/x11/xinitrc   | 21 +++++++++++++++------
 .config/x11/xprofile  |  2 +-
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.config/shell/profile b/.config/shell/profile
index 58ded94..3de6f6c 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -126,7 +126,11 @@ LICENSE=:\
 *.java=:\
 "
 
-[ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && shortcuts >/dev/null 2>&1 &
+# I'm not using Luke's shortcuts so...
+#[ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && shortcuts >/dev/null 2>&1 &
 
+# This is something luke smith has in his profile (which I have stolen, it's nice but
+# doesn't work very nicely with my login manager, lightdm, and I prefer to just run
+# startx myself if I'm not using a login manager anyway.
 # Start graphical server on user's current tty if not already running.
-[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
+#[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc
index e5b86f5..fa4d412 100755
--- a/.config/x11/xinitrc
+++ b/.config/x11/xinitrc
@@ -18,9 +18,18 @@ if [ "$HOST" == "archmetabox" ] ; then
 	xrandr --auto
 fi
 
-if [ "$HOST" == "holocene" ] ; then
-	dwmblocks &
-	exec dwm
-else
-	./$MOME/.xmonad/start-xmonad.sh
-fi
+# My default is still xmonad, maybe dwm in future?
+session=${1:-xmonad}
+
+case $session in
+    i3|i3wm)
+	    exec i3;;
+    dwm)
+	    dwmblocks &
+	    exec dwm;;
+    xmonad)
+	    exec $HOME/.xmonad/start-xmonad.sh;;
+    # No known session, try to run it as command
+    *)
+    exec twm;;
+esac
diff --git a/.config/x11/xprofile b/.config/x11/xprofile
index 3af6f44..06ddc65 100755
--- a/.config/x11/xprofile
+++ b/.config/x11/xprofile
@@ -7,7 +7,7 @@ setxkbmap dvorak &
 ~/.fehbg &
 
 # compositor
-picom &
+picom --experimental-backend &
 
 # cursor
 xsetroot -cursor_name left_ptr