X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.xsession;h=a60ea846bf7bb68c8298d346b44b5e9a9b1323fb;hb=HEAD;hp=8ddaf1dcef90016da2286d0a478a007622c2e729;hpb=84674da173dc629325926488a0351fe3c4c88766;p=x_base.git

diff --git a/.xsession b/.xsession
index 8ddaf1d..a60ea84 100755
--- a/.xsession
+++ b/.xsession
@@ -20,7 +20,7 @@ mv ~/.xsession-errors ~/.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;
+    -iname '.xsession-errors_*' -ctime +30 -delete;
 
 if locale -a |grep -qi en_US.utf8; then
     LANG="en_US.UTF-8"
@@ -56,24 +56,34 @@ if [ -e ~/.Xauthority ]; then
     cp -f .Xauthority .Xauthority.bak
 fi
 
-if cmd_exists slock && cmd_exists xautolock; then
-    fork xautolock -notifer true -bell 0 -locker slock;
+if [ -e ~/bin/screensaver ]; then
+    ~/bin/screensaver on;
+elif cmd_exists i3lock && cmd_exists xss-lock; then
+    fork xss-lock -l -- ~/bin/locker
+elif cmd_exists slock && cmd_exists xautolock; then
+    fork xautolock -notifier true -bell 0 -locker slock;
+    if cmd_exists xss-lock; then
+        fork xss-lock -- xautolock -locknow;
+    fi;
 elif cmd_exists xscreensaver && [ -e ~/.xscreensaver ]; then
     fork XENVIRONMENT=~/.xscreensaver /usr/bin/xscreensaver;
 elif cmd_exists xautolock; then
-    fork xautolock -notifer true -bell 0;
+    fork xautolock -notifier true -bell 0;
+    if cmd_exists xss-lock; then
+        fork xss-lock -- xautolock -locknow;
+    fi;
 fi;
 
 if cmd_exists redshift; then
     fork redshift;
 fi;
 
-if cmd_exists mopidy && [ -e ~/.config/mopidy/mopidy.conf ]; then
-    fork mopidy;
-elif cmd_exists mpd && [ -e ~/.mpdconf ]; then
+if cmd_exists mpd && [ -e ~/.mpdconf ]; then
     fork mpd;
     MPD_HOST=$(awk '/^bind_to_address/{print $2}' ~/.mpdconf|sed "s|~|$HOME|; s/^\"//; s/\"$//; ");
     export MPD_HOST;
+elif cmd_exists mopidy && [ -e ~/.config/mopidy/mopidy.conf ]; then
+    fork mopidy;
 fi;
 
 if [ -x /sbin/iw ] && cmd_exists nm-applet && /sbin/iw list|grep -q '^Wiphy'; then