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

diff --git a/.xsession b/.xsession
index 1957865..8ddaf1d 100755
--- a/.xsession
+++ b/.xsession
@@ -1,5 +1,17 @@
 #!/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")
@@ -44,37 +56,39 @@ if [ -e ~/.Xauthority ]; then
     cp -f .Xauthority .Xauthority.bak
 fi
 
-if [ -x /usr/bin/xscreensaver -a -e ~/.xscreensaver ]; then
-    ( XENVIRONMENT=~/.xscreensaver /usr/bin/xscreensaver >/dev/null 2>&1 &)
-elif [ -x /usr/bin/xautolock ]; then
-    (/usr/bin/xautolock -notifier true -bell 0 >/de/vnull 2>&1 &)
+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 which redshift >/dev/null 2>&1; then
-    (redshift -l 40.11059:-88.20727 >/dev/null 2>&1 &)
+if cmd_exists redshift; then
+    fork redshift;
 fi;
 
-if which mpd >/dev/null 2>&1 && [ -e ~/.mpdconf ]; then
-    (mpd >/dev/null 2>&1 &);
+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 /usr/bin/i3 ]; then
+if [ -x /sbin/iw ] && cmd_exists nm-applet && /sbin/iw list|grep -q '^Wiphy'; then
+    fork nm-applet;
+fi;
+
+if cmd_exists i3; then
+    if [ -x ~/.config/i3/build_config.sh ]; then
+        ~/.config/i3/build_config.sh;
+    fi;
     exec /usr/bin/i3;
-elif [ -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;
 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;