X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=7ba1d8c6fd9f4781e503932eab5b9ce1d26e9de6;hb=e84f32f943de369e73128c1ec30f44f04dfaa238;hp=79241ee18857e8c9ad8aa06e674f75d8bd7403a8;hpb=6a8e1f3e671b9365c3da2f2ab737ca4f5b22a33e;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 79241ee..7ba1d8c 100755
--- a/xinitrc
+++ b/xinitrc
@@ -42,7 +42,7 @@ error() {
         xmessage "$@" &
     else
         # Log message to a file which is displayed by my Zsh setup on startup.
-        echo "$*" >> "$HOME/.xinitrc.errors"
+        printf '%s\n' "$*" >>"$HOME/.xinitrc.errors"
     fi
 }
 # Save PID of the most recently started background process. Used to terminate
@@ -105,6 +105,9 @@ fi
 # necessary because of my German keyboard which I use with English settings.
 xmodmap -e 'keycode 94 = grave asciitilde'
 
+# Disable annoying audio bell. Thanks to Sebastian Rachuj.
+xset b off
+
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
     if installed hsetroot; then
@@ -146,7 +149,16 @@ fi
 (urxvt || rxvt || xterm) &
 
 # Start window manager.
-xmonad
+if installed herbstluftwm; then
+    herbstluftwm --locked >~/.config/herbstluftwm/log 2>&1
+elif installed xmonad; then
+    xmonad
+elif installed stumpwm; then
+    stumpwm
+else
+    error 'no window manager found (sleeping for 3600 seconds)'
+    sleep 3600
+fi
 
 
 # Cleanup.