X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.xsession;h=6e39043557a9d914fd81fdb62424cb69ce80068e;hb=3d24a4f856267e67447b041e3d71b2528371e754;hp=f9c4ce81ab835015f3e94e56da0f3857e9cbf75f;hpb=c93aa3b5ea2d35cc69192dbe3b364e202dd9ad87;p=x_base.git

diff --git a/.xsession b/.xsession
index f9c4ce8..6e39043 100755
--- a/.xsession
+++ b/.xsession
@@ -54,13 +54,24 @@ 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
+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 /usr/bin/awesome ]; then 
+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;