remove disk; use blank for down

[x_base.git] / .xsession

diff --git a/.xsession b/.xsession
index 29306397edf7f893afe588c0935c807ff9c58e1c..e87798dfaaf58159daeeb4dbfbbfff186cec54a5 100755 (executable)
--- a/.xsession
+++ b/.xsession
@@ -5,7 +5,7 @@ echo "Starting new session"
 DATE=$(date "+%Y%m%d_%H%M%S")
 # track xsession errors
 mv ~/.xsession-errors ~/.xsession-errors_${DATE};
-ln ~/.xsession-errors-current ~/.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;
@@ -44,13 +44,28 @@ if [ -e ~/.Xauthority ]; then
     cp -f .Xauthority .Xauthority.bak
 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 &
+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 &)
 fi;
 
-if [ -x /usr/bin/awesome ]; then 
+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/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;