X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.xsession;h=8ddaf1dcef90016da2286d0a478a007622c2e729;hb=84674da173dc629325926488a0351fe3c4c88766;hp=c7cec500e2fa745717e3d12e372e06c24f0b5948;hpb=1718f0a571d31909fd4a554c98feba1210f30e72;p=x_base.git

diff --git a/.xsession b/.xsession
index c7cec50..8ddaf1d 100755
--- a/.xsession
+++ b/.xsession
@@ -1,7 +1,27 @@
 #!/bin/sh
 
+cmd_exists () {
+    if which "$1" >/dev/null 2>&1; then
+        return 0;
+    else
+        return 1;
+    fi;
+}
+
+fork () {
+    ( "$@" >/dev/null 2>&1 & )
+}
+
 echo "Starting new session"
 
+DATE=$(date "+%Y%m%d_%H%M%S")
+# track xsession errors
+mv ~/.xsession-errors ~/.xsession-errors_${DATE};
+ln -sf ~/.xsession-errors_${DATE} ~/.xsession-errors-current;
+# delete old xsession error files
+find ~/ -maxdepth 1 -mindepth 1 -type f \
+    -iname '.xsession-errors*' -ctime +30 -delete;
+
 if locale -a |grep -qi en_US.utf8; then
     LANG="en_US.UTF-8"
 else
@@ -34,27 +54,41 @@ fi;
 # make a backup of the .Xauthority
 if [ -e ~/.Xauthority ]; then
     cp -f .Xauthority .Xauthority.bak
+fi
+
+if cmd_exists slock && cmd_exists xautolock; then
+    fork xautolock -notifer true -bell 0 -locker slock;
+elif cmd_exists xscreensaver && [ -e ~/.xscreensaver ]; then
+    fork XENVIRONMENT=~/.xscreensaver /usr/bin/xscreensaver;
+elif cmd_exists xautolock; then
+    fork xautolock -notifer true -bell 0;
+fi;
+
+if cmd_exists redshift; then
+    fork redshift;
+fi;
+
+if cmd_exists mopidy && [ -e ~/.config/mopidy/mopidy.conf ]; then
+    fork mopidy;
+elif cmd_exists mpd && [ -e ~/.mpdconf ]; then
+    fork mpd;
+    MPD_HOST=$(awk '/^bind_to_address/{print $2}' ~/.mpdconf|sed "s|~|$HOME|; s/^\"//; s/\"$//; ");
+    export MPD_HOST;
+fi;
+
+if [ -x /sbin/iw ] && cmd_exists nm-applet && /sbin/iw list|grep -q '^Wiphy'; then
+    fork nm-applet;
 fi;
 
-if [ -x /usr/bin/xautolock ]; then
-    /usr/bin/xautolock -notifier true -bell 0 &
-elif [ -x /usr/bin/xscreensaver -a -e ~/.xscreensaver ]; then
-    /usr/bin/xscreensaver &
-fi;
-
-if [ -x /usr/bin/awesome ]; then 
-    exec /usr/bin/awesome;
-elif [ -x /usr/bin/ion3 ]; then
-    exec /usr/bin/ion3;
-elif [ -x /usr/bin/openbox ]; then
-        exec /usr/bin/openbox;
-elif [ -x /usr/bin/rxvt ]; then
-        exec /usr/bin/rxvt;
-elif [ -x /usr/bin/rxvt-unicode ]; then
-        exec /usr/bin/rxvt-unicode;
-elif [ -x /usr/bin/xterm ]; then
-        exec /usr/bin/xterm;
+if cmd_exists i3; then
+    if [ -x ~/.config/i3/build_config.sh ]; then
+        ~/.config/i3/build_config.sh;
+    fi;
+    exec /usr/bin/i3;
 else
-     # we're screwed.
-     sleep 2s;
+    for prog in awesome ion3 openbox stterm st rxvt rxvt-unicode xterm; do
+        if cmd_exists $prog; then
+            exec $(which $prog)
+        fi
+    done;
 fi;