X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.xsession;h=94fa4f6fe2bd1965777398f41fba8db2ea70536b;hb=37a5bb161dfda366a6988f4ed9af6795992cba85;hp=9fa8afbc999c95665e9b3947d80bad3a908e4ce6;hpb=d33338b61c32d89e922708bedf486f8511c21226;p=x_base.git

diff --git a/.xsession b/.xsession
index 9fa8afb..94fa4f6 100755
--- a/.xsession
+++ b/.xsession
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+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
@@ -13,16 +23,13 @@ if [ -d ~/tmp ]; then
    export TMPDIR=$(echo ~/tmp)
 fi;
 
-if [ "$HOSTNAME" == "archimedes" ]; then
-    xmodmap -e 'keycode 158 = XF86AudioRaiseVolume'
-    xmodmap -e 'keycode 146 = XF86AudioLowerVolume'
-    xset r rate 170 40
+# 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 'keycode 115 = Multi_key'
-xmodmap -e 'keycode 116 = Super_L'
 xmodmap -e 'clear mod4'
-xmodmap -e 'add mod4 = Super_L'
+xmodmap -e 'add mod4 = Super_L Super_R'
 
 if [ -e ~/.Xresources_$HOSTNAME ]; then
     xrdb -merge < ~/.Xresources_$HOSTNAME;
@@ -35,10 +42,21 @@ 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 33.9533:-117.3953 >/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/\"$//; ");
 fi;
 
 if [ -x /usr/bin/awesome ]; then