X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=herbstluftwm%2Fautostart;h=d58ff9ed6dab4d184b43ac486def88cce78154ae;hb=b71680c55e6e492ed008f8ec5af3bf169b272f09;hp=6ba04041fb40172d03f6d61e30e8a3f42ffb9f86;hpb=0006d0d758a63074615df7d1b803aeca042e03a0;p=config%2Fdotfiles.git

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 6ba0404..d58ff9e 100755
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -18,7 +18,7 @@
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 
 hc() {
@@ -67,28 +67,8 @@ hc keybind $mod-Shift-Return spawn urxvt
 hc keybind $mod-Shift-c close
 hc keybind $mod-q reload
 hc keybind $mod-Shift-q quit
-# Find an existing screen locker.
-for locker in xscreensaver xtrlock ''; do
-    if installed "$locker"; then
-        break
-    fi
-done
-if test -z "$locker"; then
-    echo 'No screen locker found!' | notify 60
-fi
-# Additional options.
-locker_pre=
-if test x"$locker" = xxscreensaver; then
-    # Start xscreensaver if it's not already running. xscreensaver-command
-    # ensures xscreensaver is availble for the current X session.
-    locker_pre='xscreensaver-command -time >/dev/null 2>&1 || xscreensaver &'
-    locker='xscreensaver-command -lock'
-elif test x"$locker" = xxtrlock; then
-    # Sleep is necessary to allow xtrlock to grab the keyboard input.
-    locker_pre='sleep 1;'
-fi
 # Lock the screen.
-hc keybind $mod-z spawn sh -c "$locker_pre exec $locker"
+hc keybind $mod-z spawn "$HOME/.xlockscreen" lock
 
 # Tag key bindings. Create tags 1 to 9 with bindings to switch and move
 # windows to them.
@@ -195,6 +175,6 @@ hc rule instance=Navigator class=Iceweasel tag=2
 hc unlock
 
 
-# To notify me if set -e has terminated the script (then this part won't get
+# To notify me if set -eu has terminated the script (then this part won't get
 # executed).
 echo 'hlwm restarted' | notify 1