X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=aa5bfafb31f9758ce70f7093026fc43a09fc91fb;hb=74b0084e05bcbb2d3518f756eb1a5c115c7027b3;hp=f262caeb25e969f30054ba64f5dab1457326b369;hpb=00b1df174cf33da23c6084c38a607b5371d19355;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index f262cae..aa5bfaf 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
@@ -92,8 +92,21 @@ if installed setxkbmap; then
     setxkbmap us
 fi
 
-# Use my X11 key bindings.
-xmodmap "$HOME/.xmodmaprc"
+# Use the Caps lock as Ctrl because it's easier to reach and very useful for
+# all programs. Caps lock is removed completely. Thanks to
+# http://snarfed.org/space/switch%20control%20and%20caps%20lock
+if xmodmap | grep -E '^lock.*Caps_Lock' >/dev/null; then
+    xmodmap -e 'remove Lock = Caps_Lock'
+    xmodmap -e 'remove Control = Control_L'
+    xmodmap -e 'keysym Caps_Lock = Control_L'
+    xmodmap -e 'add Control = Control_L'
+fi
+# Move grave and tilde next to left shift key. This setting may only be
+# 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
@@ -132,11 +145,22 @@ elif test -n "$screen_lock_force"; then
 fi
 
 
-# XMonad doesn't start a terminal emulator on its own, start one when I login.
+# My window managers doesn't start a terminal emulator on its own, start one
+# when I login.
 (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.
 #