X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=herbstluftwm%2Fautostart;h=a9d530f2fc561be4160a55455907b77babc73561;hb=e0a76c26f9164e070166fcc62e1c287cc1033eef;hp=97980b27e323106dba0ec484492e4b8ba71ab08e;hpb=72cba8d8ac97dc3c34cfd4cd244e258fe5d40f87;p=config%2Fdotfiles.git

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index 97980b2..a9d530f 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() {
@@ -30,7 +30,9 @@ installed() {
 # $1: timeout
 notify() {
     if installed dzen2; then
-        sed 's/\^/^^/g' | dzen2 -fg blue -bg yellow -y 15 -h 30 -p "$1"
+        read x
+        printf '%s\n' "$x" | sed 's/\^/^^/g' \
+            | dzen2 -fg blue -bg yellow -y 15 -h 30 -p "$1" &
     elif installed xmessage; then
         # Fallback solution, display first line of stdin.
         read x
@@ -65,23 +67,13 @@ 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 xtrlock ''; do
-    if installed "$locker"; then
-        break
-    fi
-done
-if test -z "$locker"; then
-    echo 'No screen locker found!' | notify 60
-fi
-# Lock the screen. The sleep is necessary to allow xtrlock to grab the
-# keyboard input.
-hc keybind $mod-z spawn sh -c "sleep 1 && exec $locker"
+# Lock the screen.
+hc keybind $mod-z spawn "$HOME/.xlockscreen" lock
 
-# Tag key bindings. Create tags 1 to 9 with bindings to switch and move
+# Tag key bindings. Create tags 1 to 0 with bindings to switch and move
 # windows to them.
 hc rename default 1 2>/dev/null || true
-for i in `seq 1 9`; do
+for i in `seq 1 9` 0; do
     hc add "$i"
     hc keybind "$mod-$i" use "$i"
     hc keybind "$mod-Shift-$i" move "$i"
@@ -123,6 +115,8 @@ hc mouseunbind --all
 
 # Necessary for Java so it recognizes herbstluftwm as tiling window manager.
 hc set wmname LG3D
+# Auto-detect new monitors.
+hc set auto_detect_monitors 1
 
 
 # WINDOW and FRAME SETTINGS
@@ -181,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