From 7ad44de35363eee09b1bd729df7af35220ee3c1c Mon Sep 17 00:00:00 2001
From: Luca Bilke <bilke@tralios.de>
Date: Thu, 14 Dec 2023 17:14:43 +0100
Subject: [PATCH] cleanup

---
 .config/X11/realinit                   |  2 --
 .config/X11/xinitrc                    | 21 ++++++++++++++++++++-
 .config/X11/xsession.d/80autostart     |  3 +--
 .local/share/applications/file.desktop |  2 +-
 .local/share/applications/text.desktop |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/.config/X11/realinit b/.config/X11/realinit
index 0223cc24e..7c26c5dcd 100755
--- a/.config/X11/realinit
+++ b/.config/X11/realinit
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 X11_CONFIG="$XDG_CONFIG_HOME/X11"
 SESSIONFILES=$(run-parts --list "$X11_CONFIG/xsession.d")
 
diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
index 0c3d5dc80..252b9dcb2 100755
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
@@ -1,2 +1,21 @@
 #!/bin/sh
-exec dbus-run-session -- $XDG_CONFIG_HOME/X11/realinit
+
+exec dbus-run-session -- sh -c "
+X11_CONFIG=\"$XDG_CONFIG_HOME/X11\"
+SESSIONFILES=$(run-parts --list "$X11_CONFIG/xsession.d")
+
+if [ -n \"$SESSIONFILES\" ]; then
+	set +e
+	for SESSIONFILE in $SESSIONFILES; do
+		echo \"Executing $SESSIONFILE\"
+		$SESSIONFILE
+	done
+	set -e
+fi
+
+. \"$X11_CONFIG/xprofile\"
+
+echo $DBUS_SESSION_BUS_ADDRESS > $XDG_STATE_HOME/dbus_session_address
+
+dwm
+"
diff --git a/.config/X11/xsession.d/80autostart b/.config/X11/xsession.d/80autostart
index abb308628..20d676f99 100755
--- a/.config/X11/xsession.d/80autostart
+++ b/.config/X11/xsession.d/80autostart
@@ -4,8 +4,7 @@ start() {
 	pidof -sx $1 || $@ &
 }
 
-xwallpaper --zoom "${XDG_DATA_HOME:-$HOME/.local/share}/bg" &
-
+start xwallpaper --zoom "${XDG_DATA_HOME:-$HOME/.local/share}/bg"
 start pipewire
 start pipewire -c pipewire-pulse.conf
 start wireplumber
diff --git a/.local/share/applications/file.desktop b/.local/share/applications/file.desktop
index c4b8eef7c..ab546ffb7 100644
--- a/.local/share/applications/file.desktop
+++ b/.local/share/applications/file.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Type=Application
 Name=File Manager
-Exec=st -e lfcd %u
+Exec=/usr/bin/st -e lfcd %u
diff --git a/.local/share/applications/text.desktop b/.local/share/applications/text.desktop
index f34b8f04f..8c0479011 100644
--- a/.local/share/applications/text.desktop
+++ b/.local/share/applications/text.desktop
@@ -1,4 +1,4 @@
 [Desktop Entry]
 Type=Application
 Name=Text editor
-Exec=st -e nvim %u
+Exec=/usr/bin/st -e nvim %u