update awesome configuration for newer versions of awesome

[x_base.git] / .xsession

diff --git a/.xsession b/.xsession
index 3cde1db99b4362009cca3bf00c9519c20bfdb39d..ce8b2b5275160a7b0c5812c746626bbe7032c913 100755 (executable)
--- a/.xsession
+++ b/.xsession
@@ -45,7 +45,7 @@ if [ -e ~/.Xauthority ]; then
 fi
 
 if [ -x /usr/bin/xscreensaver -a -e ~/.xscreensaver ]; then
-    (/usr/bin/xscreensaver >/dev/null 2>&1 &)
+    ( 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;
@@ -54,6 +54,12 @@ 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/\"$//; ");
+    export MPD_HOST;
+fi;
+
 if [ -x /usr/bin/awesome ]; then 
     exec /usr/bin/awesome;
 elif [ -x /usr/bin/ion3 ]; then