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
#
# 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
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
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
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
-# 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.
#