use xss lock or ~/bin/scrensaver if it exists; fix lock

diff --git a/.config/i3/config_base b/.config/i3/config_base
index b8078865015a06eea17964ff348a337e5a7a6125..97fa923d9d091e1249b53baec87e32e45f0f6bf8 100644 (file)
--- a/.config/i3/config_base
+++ b/.config/i3/config_base
@@ -192,7 +192,7 @@ bindsym XF86MonBrightnessDown exec sudo /home/don/bin/intel_brightness dec
 # seach/tools/wlan/display
 bindsym XF86WLAN exec --no-startup-id toggle_rfkill
 #bindsym XF86Display exec presentation_mode
-bindsym $mod+minus exec "sh -c 'xscreensaver-command -lock; xautolock -locknow'"
+bindsym $mod+minus exec "sh -c 'loginctl lock-session || xscreensaver-command -lock || xautolock -locknow'"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)

diff --git a/.xsession b/.xsession
index d622c432f0cdadb8fc779ed13cf22c38f1677246..a60ea846bf7bb68c8298d346b44b5e9a9b1323fb 100755 (executable)
--- 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