X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=.xsession;fp=.xsession;h=a60ea846bf7bb68c8298d346b44b5e9a9b1323fb;hb=98ce5ad0815d7a2e8d703b4c3999c8514569ec6c;hp=d622c432f0cdadb8fc779ed13cf22c38f1677246;hpb=8cb930080f1858b8eaa19a8b9b71add730554cf7;p=x_base.git

diff --git a/.xsession b/.xsession
index d622c43..a60ea84 100755
--- a/.xsession
+++ b/.xsession
@@ -56,12 +56,22 @@ if [ -e ~/.Xauthority ]; then
     cp -f .Xauthority .Xauthority.bak
 fi
 
-if cmd_exists slock && cmd_exists xautolock; then
+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 -notifier true -bell 0;
+    if cmd_exists xss-lock; then
+        fork xss-lock -- xautolock -locknow;
+    fi;
 fi;
 
 if cmd_exists redshift; then