X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.xsession;h=6e39043557a9d914fd81fdb62424cb69ce80068e;hb=2c774a962a9d89c09ecc517f0e6d32f4a9f51eb8;hp=340c14b5c515776997272bcb93bfc8c399b63289;hpb=6f7970a39bc9580d0fad7b14f40a3364e75ef4e9;p=x_base.git

diff --git a/.xsession b/.xsession
index 340c14b..6e39043 100755
--- a/.xsession
+++ b/.xsession
@@ -2,6 +2,14 @@
 
 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,13 +42,36 @@ fi;
 # make a backup of the .Xauthority
 if [ -e ~/.Xauthority ]; then
     cp -f .Xauthority .Xauthority.bak
-fi;
+fi
 
 if [ -x /usr/bin/xscreensaver -a -e ~/.xscreensaver ]; then
-    /usr/bin/xscreensaver &
+    ( 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 &)
+fi;
+
+if which redshift >/dev/null 2>&1; then
+    (redshift -l 40.11059:-88.20727 >/dev/null 2>&1 &)
+fi;
+
+if which mopidy >/dev/null 2>&1 && [ -e ~/.config/mopidy/mopidy.conf ]; then
+    (mopidy > /dev/null 2>&1 & );
+elif which mpd >/dev/null 2>&1 && [ -e ~/.mpdconf ]; then
+    (mpd >/dev/null 2>&1 &);
+    MPD_HOST=$(awk '/^bind_to_address/{print $2}' ~/.mpdconf|sed "s|~|$HOME|; s/^\"//; s/\"$//; ");
+    export MPD_HOST;
+fi;
+
+if [ -x /sbin/iw ] && which nm-applet >/dev/null 2>&1 && /sbin/iw list|grep -q '^Wiphy'; then
+    ( nm-applet > /dev/null 2>&1 & );
 fi;
 
-if [ -x /usr/bin/awesome ]; then 
+if [ -x /usr/bin/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;