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

diff --git a/xinitrc b/xinitrc
index fc4582d..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
@@ -60,6 +60,8 @@ background_pids=
 #
 # Default to use a background image.
 set_background=yes
+# Default to display a warning if `xautolock` is not available.
+screen_lock_force=yes
 # Lock screen after x minutes of inactivity, requires `xautolock` to be
 # installed.
 screen_lock_time=3
@@ -72,9 +74,11 @@ if test -f "$HOME/.xinitrc.local"; then
 fi
 
 
-# Start ssh-agent if we have private keys, thanks to
+# Start ssh-agent if no agent is running and we have private keys, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
-if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then
+if test -z "$SSH_AGENT_PID" \
+        && test -x /usr/bin/ssh-agent \
+        && test -f "$HOME/.ssh/id_rsa"; then
     # -s to force bourne shell output. This file is a bourne shell script even
     # if the environment might suggest otherwise.
     eval `/usr/bin/ssh-agent -s` >/dev/null
@@ -88,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
@@ -123,6 +140,8 @@ if installed xautolock; then
     else
         error "Locker '$screen_locker' not installed. Auto lock won't work!"
     fi
+elif test -n "$screen_lock_force"; then
+    error "'xautolock' not found. Auto lock won't work!"
 fi
 
 
@@ -132,6 +151,7 @@ fi
 # Start window manager.
 xmonad
 
+
 # Cleanup.
 #
 # Kill ssh-agent to prevent unused background processes.