don't expose my current location in my .xsession

[x_base.git] / .xsession

diff --git a/.xsession b/.xsession
index f190757950cf090a5e243ad84178be1745c133db..76b01dbddaf3d3128612e6db166471c2a84577a3 100755 (executable)
--- a/.xsession
+++ b/.xsession
@@ -44,13 +44,36 @@ 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 &&
+       [ -e .location ]; then
+    . .location
+    (redshift -l $LOCATION >/dev/null 2>&1 &)
+fi;
+
+if which mopidy >/dev/null 2>&1 && [ -e ~/.config/mopidy/mopidy.conf ]; then
+    (mopidy > /dev/null 2>&1 & );
+elif 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 /sbin/iw ] && which nm-applet >/dev/null 2>&1 && /sbin/iw list|grep -q '^Wiphy'; then
+    ( nm-applet > /dev/null 2>&1 & );
+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;