stop allowing meta-return to do fullscreen

[x_base.git] / .xsession

diff --git a/.xsession b/.xsession
index f190757950cf090a5e243ad84178be1745c133db..f9c4ce81ab835015f3e94e56da0f3857e9cbf75f 100755 (executable)
--- a/.xsession
+++ b/.xsession
@@ -44,10 +44,20 @@ 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 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