From 2655358c9e5ed38732021e9db895e3ac7d1ed6c0 Mon Sep 17 00:00:00 2001
From: Luca Bilke <bilke@tralios.de>
Date: Sat, 27 May 2023 10:57:43 +0200
Subject: [PATCH] xinit updates

---
 .config/X11/realinit                             | 16 ++++++++++++++++
 .config/X11/xinitrc                              |  2 +-
 .config/X11/xserverrc                            |  4 ----
 .../X11/{xinitrc.d => xsession.d}/60gpg-agent    |  0
 .../X11/{xinitrc.d => xsession.d}/80autostart    |  0
 .../X11/{xinitrc.d => xsession.d}/90xsecurelock  |  0
 6 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100755 .config/X11/realinit
 mode change 100644 => 100755 .config/X11/xinitrc
 delete mode 100755 .config/X11/xserverrc
 rename .config/X11/{xinitrc.d => xsession.d}/60gpg-agent (100%)
 rename .config/X11/{xinitrc.d => xsession.d}/80autostart (100%)
 rename .config/X11/{xinitrc.d => xsession.d}/90xsecurelock (100%)

diff --git a/.config/X11/realinit b/.config/X11/realinit
new file mode 100755
index 00000000..c435cf0c
--- /dev/null
+++ b/.config/X11/realinit
@@ -0,0 +1,16 @@
+#!/bin/sh -x
+
+SESSIONDIR="$XDG_CONFIG_HOME/X11/xsession.d"
+SESSIONFILES=$(run-parts --list $SESSIONDIR)
+if [ -n "$SESSIONFILES" ]; then
+	set +e
+	for SESSIONFILE in $SESSIONFILES; do
+		message "Executing $SESSIONFILE"
+		$SESSIONFILE
+	done
+	set -e
+fi
+
+. "$XDG_CONFIG_HOME/X11/xprofile"
+
+exec dwm
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
old mode 100644
new mode 100755
index 3151e38e..0c3d5dc8
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec dbus-run-session -- sh $XDG_CONFIG_HOME/X11/realinit
+exec dbus-run-session -- $XDG_CONFIG_HOME/X11/realinit
diff --git a/.config/X11/xserverrc b/.config/X11/xserverrc
deleted file mode 100755
index 8f1c0149..00000000
--- a/.config/X11/xserverrc
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-# stty icrnl
-exec /usr/bin/Xorg -nolisten tcp "$@" vt$XDG_VTNR
diff --git a/.config/X11/xinitrc.d/60gpg-agent b/.config/X11/xsession.d/60gpg-agent
similarity index 100%
rename from .config/X11/xinitrc.d/60gpg-agent
rename to .config/X11/xsession.d/60gpg-agent
diff --git a/.config/X11/xinitrc.d/80autostart b/.config/X11/xsession.d/80autostart
similarity index 100%
rename from .config/X11/xinitrc.d/80autostart
rename to .config/X11/xsession.d/80autostart
diff --git a/.config/X11/xinitrc.d/90xsecurelock b/.config/X11/xsession.d/90xsecurelock
similarity index 100%
rename from .config/X11/xinitrc.d/90xsecurelock
rename to .config/X11/xsession.d/90xsecurelock