X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=.xsession;h=a60ea846bf7bb68c8298d346b44b5e9a9b1323fb;hb=HEAD;hp=30b841f7ee4dc859cca9b4fac1d047c9b60bb55b;hpb=7818b670e93bfe7e81127254a0b2ca2ab3245158;p=x_base.git

diff --git a/.xsession b/.xsession
index 30b841f..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
-    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