manage session

.config/X11/session

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+resources=${XDG_CONFIG_HOME}/X11/resources
+if [ -f "$resources" ]; then xrdb -merge "$resources"; fi
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+	for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+		[ -x "$f" ] && source "$f"
+	done; unset f
+fi
+
+source ${XDG_CONFIG_HOME}/X11/profile
+
+if [[ -n "$@" ]]; then
+	exec "$@"
+fi

.config/X11/xinitrc

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# ==== DO NOT edit this section ====
-userresources=${XDG_CONFIG_HOME}/X11/Xresources
-usermodmap=${XDG_CONFIG_HOME}/X11/Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-if [ -f $sysresources ]; then xrdb -merge $sysresources; fi
-if [ -f $sysmodmap ]; then xmodmap $sysmodmap; fi
-if [ -f "$userresources" ]; then xrdb -merge "$userresources"; fi
-if [ -f "$usermodmap" ]; then xmodmap "$usermodmap"; fi
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-	for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-		[ -x "$f" ] && . "$f"
-	done; unset f
-fi
-# ==================================
-
-source ${XDG_CONFIG_HOME}/X11/xprofile
-
-# alternative program
-if [[ -n "$@" ]]; then
-	exec "$@"
-fi
-
-exec qtile

.config/zsh/.zprofile

@@ -1,4 +1,4 @@
 # Autostart X
 if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
-	xinit
+	xinit qtile
 fi

.pam_environment

@@ -33,8 +33,8 @@ ANTIBODY_HOME	DEFAULT=${XDG_DATA_HOME}/antibody
 XAUTHORITY	DEFAULT=${XDG_RUNTIME_DIR}/Xauthority
 
 # xinit
-XINITRC		DEFAULT=${XDG_CONFIG_HOME}/X11/xinitrc
-XSERVERRC	DEFAULT=${XDG_CONFIG_HOME}/X11/xserverrc
+XINITRC		DEFAULT=${XDG_CONFIG_HOME}/X11/session
+XSERVERRC	DEFAULT=${XDG_CONFIG_HOME}/X11/serverrc
 
 # less
 LESSKEY		DEFAULT=${XDG_CONFIG_HOME}/less/lesskey