env: Persistent files and daemon FIFOs now unique per login session

This fixes the long-standing issue of multiple xwin-* daemons and companion
scripts trying to write to the same FIFOs if multiple instances of the
graphical shell are running on the same machine.

Renamed and moved FIFO paths out of $HOME, making use of $XDG_SESSION_ID
everywhere with fallbacks for non-systemd systems.

xwin-statusd really doesn't need a computationally slow unique S_FIFO path, now
uses PID to match xwin-decor.

Author: microsounds

.bashrc

@@ -19,8 +19,8 @@ export COLOR=1; case $TERM in
 	*) [ $(tput colors) -lt 8 ] && unset COLOR
 esac
 
-# persist $OLDPWD between sessions
-export LASTDIR="${XDG_RUNTIME_DIR:-/tmp}/.oldpwd"
+# persist $OLDPWD between shells on same login session
+export LASTDIR="${XDG_RUNTIME_DIR:-/tmp}/.oldpwd.$XDG_SESSION_ID"
 [ -f "$LASTDIR" ] && read -r OLDPWD < "$LASTDIR"
 
 # truncate long prompt pathnames over N characters

.config/sxhkd/default

@@ -48,8 +48,10 @@ ctrl + alt + {Delete,Insert}
 	visual {htop,watch -c -n 0.1 'dmesg -e -Lalways | tac'}
 # rotate display orientation
 shift + super + {Up,Down,Left,Right}
+	PITCHED_SFX(cncl03) \
 	sfx-synth btn & \
-	echo '{bottom-up,normal,right-up,left-up}' >> ~/.rotate
+	echo '{bottom-up,normal,right-up,left-up}' \
+		> "$XDG_RUNTIME_DIR/.rotate.$XDG_SESSION_ID"
 
 ## function keys
 # F1: power/reboot

.local/bin/startx

@@ -22,5 +22,5 @@ done
 [ ! -z "$xopt" ] && xopt="-config $(id -u)-override/$xopt.conf"
 
 # record time at startup
-date '+%s%N' > "$XDG_RUNTIME_DIR/.$XDG_SESSION_TYPE$XDG_VTNR"
+date '+%s%N' > "$XDG_RUNTIME_DIR/.xinit-st.$XDG_SESSION_ID"
 exec /usr/bin/startx "$@" -- $xopt

.local/bin/xwin-tabletd

@@ -13,19 +13,23 @@ dpy_digitizer="$(xinput list --name-only | grep -i wacom)"
 # detect laptop mouse pointer devices
 ptr_devices="$(xinput list --name-only | egrep -i '(touchpad|trackpoint)')"
 
-trap 'kill $!' 0 1 2 3 6 15
+abort() {
+	kill $!
+	rm -rf "$R_FIFO"
+}
+trap abort 0 1 2 3 6 15
 
 # workarounds for iio-sensor-proxy
-# repeatedly poke accelerometer on a timer to avoid aggressive battery optimization
+# repeatedly poke sensor on a timer to avoid aggressive battery optimization
 while :; do
 	cat /sys/bus/iio/devices/iio:device0/in_accel_x_raw > /dev/null
 	sleep 2
 done &
 
-# sxhkd: allows manual override if and when accelerometer stops responding
-RFIFO="$HOME/.rotate"
-[ ! -p "$RFIFO" ] && mkfifo "$RFIFO"
-monitor-sensor >> "$RFIFO" &
+# rotation FIFO for external control via sxhkd
+R_FIFO="$XDG_RUNTIME_DIR/.rotate.$XDG_SESSION_ID"
+[ ! -p "$R_FIFO" ] && mkfifo "$R_FIFO"
+monitor-sensor >> "$R_FIFO" &
 
 while read -r line; do
 	state="${line##* }"
@@ -53,4 +57,4 @@ while read -r line; do
 				[ "$rot" = "normal" ] && xinput enable "$f" || xinput disable "$f"
 		done &
 	fi
-done < "$RFIFO"
+done < "$R_FIFO"

.local/lib/notify-send

@@ -4,9 +4,9 @@
 # send notifications and OSD messages through xwin-statusd
 # accepts message arguments or first line passed through stdin
 
-NFIFO="$HOME/.notify"
-[ -p "$NFIFO" ] ||
-	{ echo "${0##*/}: Cannot write to '$NFIFO', exiting." 1>&2; exit 1; }
+N_FIFO="$XDG_RUNTIME_DIR/.notify.$XDG_SESSION_ID"
+[ -p "$N_FIFO" ] ||
+	{ echo "${0##*/}: Cannot write to '$N_FIFO', exiting." 1>&2; exit 1; }
 
 unset SECS
 case "$1" in
@@ -15,5 +15,5 @@ case "$1" in
 esac
 SECS="${SECS:-5}" # default is 5 seconds
 
-echo "$SECS ${@:-$(cat /dev/stdin)}" >> "$HOME/.notify"
+echo "$SECS ${@:-$(cat /dev/stdin)}" >> "$N_FIFO"
 

.profile

@@ -13,8 +13,10 @@ export XDG_CONFIG_HOME="$HOME/.config"
 
 # force cache writes to ramdisk
 # fallback to /tmp if pam_systemd doesn't provide ramdisk
+# fallback unique session ID on non-systemd systems
 export XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR:-/tmp}"
 export XDG_CACHE_HOME="$XDG_RUNTIME_DIR"
+export XDG_SESSION_ID="${XDG_SESSION_ID:-$$}"
 
 # persist for current session only, return 0 on logout
 trap 'ssh-agent -k > /dev/null || :' 0 1 3 6 15

.xinitrc

@@ -102,11 +102,12 @@ urxvtd -o &
 otd-daemon &
 lxpolkit &
 
-## profiling and housekeeping
-read st < "$XDG_RUNTIME_DIR/.$XDG_SESSION_TYPE$XDG_VTNR"
+## startup profiling and housekeeping
+timest="$XDG_RUNTIME_DIR/.xinit-st.$XDG_SESSION_ID"
+read st < "$timest"
 ed=$(date '+%s%N')
 {
-	rm -rf ~/wget-log*
+	rm -rf "$timest" wget-log*
 	sleep 1
 	echo "~/${0##*/} finished in $(((ed - st) / 1000000))ms." | notify-send -t 0.5
 } &

Scripts/wm_status.sh

@@ -24,39 +24,38 @@ for f in $pad $quote; do # surround output with special characters
 done
 unset IFS
 
-# FIFO locations
+# status bar FIFO path not exposed to other scripts for stability
 prog="${0##*/}"
-key="$(tr -cd 'a-z0-9' < /dev/urandom | dd bs=7 count=1 2> /dev/null)"
-FIFO="${XDG_RUNTIME_DIR:-/tmp}/.${prog%.*}.$key"
+S_FIFO="${XDG_RUNTIME_DIR:-/tmp}/.${prog%.*}.$$"
 
 # notification FIFO written to by notify-send
-NFIFO="$HOME/.notify"
+N_FIFO="$XDG_RUNTIME_DIR/.notify.$XDG_SESSION_ID"
 
 abort() {
-	rm -rf "$FIFO" "$NFIFO"
+	rm -rf "$S_FIFO" "$N_FIFO"
 	echo "[!] ${0##*/} terminated unexpectedly" | sed -e "$script"
 	kill -- -$$ > /dev/null 2>&1
 }
 
 trap abort 0 1 2 3 6 15
-mkfifo "$FIFO" "$NFIFO"
+mkfifo "$S_FIFO" "$N_FIFO"
 
 # monitor and redirect notifications from notify-send
 # prevent named pipe from closing
 {	while :; do
-		while read -r msg < "$NFIFO"; do
+		while read -r msg < "$N_FIFO"; do
 			echo "MSG $msg"
 		done
 	done
-} > "$FIFO" &
+} > "$S_FIFO" &
 
 # thread loop
 launch() {
 	while :; do
 		sleep "$2" &
 		"$1"
 		wait
-	done > "$FIFO" &
+	done > "$S_FIFO" &
 }
 
 # individual threads
@@ -268,4 +267,4 @@ while read -r module data; do
 	# output final formatted status line
 	echo "$bar" | sed -e "$script"
 
-done < "$FIFO"
+done < "$S_FIFO"

Scripts/xwin_decor.sh

@@ -74,7 +74,7 @@ ffmpeg_cat() {
 
 # remove trash from previous iterations
 rm -rf "$XDG_RUNTIME_DIR/${0##*/}"*
-temp="$XDG_RUNTIME_DIR/${0##*/}-$$" && mkdir -p "$temp"
+temp="$XDG_RUNTIME_DIR/${0##*/}.$$" && mkdir -p "$temp"
 
 # pcmanfm will randomly re-read wallpaper files after they're deleted, leading
 # to black screens, just leave temp dir trash to be cleaned up on next run