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

diff --git a/xinitrc b/xinitrc
index f262cae..b286dbc 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
@@ -138,6 +151,7 @@ fi
 # Start window manager.
 xmonad
 
+
 # Cleanup.
 #
 # Kill ssh-agent to prevent unused background processes.