X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.xsession;h=e87798dfaaf58159daeeb4dbfbbfff186cec54a5;hb=02292ef4c662e32262086a018b3d98c84758d92a;hp=7723cc430363b6a2d4de0fc80d628c8c2d811932;hpb=15be4bb0a5f0047bd2f1fac454363683b1f4d501;p=x_base.git

diff --git a/.xsession b/.xsession
index 7723cc4..e87798d 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
@@ -15,10 +23,10 @@ if [ -d ~/tmp ]; then
    export TMPDIR=$(echo ~/tmp)
 fi;
 
-xmodmap -e 'keycode 115 = Multi_key'
 # No clue why this has changed from Alt_R to Down, but we really want Down.
 if ! xmodmap -pk|grep -qe '116.*Down'; then
     xmodmap -e 'keycode 116 = Super_L'
+    xmodmap -e 'keycode 115 = Multi_key'
 fi;
 xmodmap -e 'clear mod4'
 xmodmap -e 'add mod4 = Super_L Super_R'
@@ -34,13 +42,30 @@ 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 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 /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;