X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=d1e25e778554da8187505a186e468570c2c8cab2;hb=2adf5938a80c5d232e5ac05a1433ff41c55aad30;hp=858cbaa1320ab6500fa184f000bbfa10b2a65738;hpb=3e05c1d4dda93e05aad2ef37900754f77c026d82;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 858cbaa..d1e25e7 100755
--- a/xinitrc
+++ b/xinitrc
@@ -24,12 +24,6 @@
 # LANG set (for Python's decode() function). Therefore load my general shell
 # environment which also includes $LANG.
 if test -f "$HOME/.shell/env"; then
-    # Debug function used in ~/.shell/env.
-    source_debug() {
-        # Do nothing.
-        :
-    }
-
     . "$HOME/.shell/env"
 fi
 
@@ -74,11 +68,9 @@ if test -f "$HOME/.xinitrc.local"; then
 fi
 
 
-# Start ssh-agent if no agent is running and we have private keys, thanks to
+# Start ssh-agent if no agent is running, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
-if test -z "$SSH_AGENT_PID" \
-        && 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; 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
@@ -102,12 +94,15 @@ if xmodmap | grep -E '^lock.*Caps_Lock' >/dev/null; then
     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.
+# necessary because of my German keyboard which I use with an English layout.
 xmodmap -e 'keycode 94 = grave asciitilde'
 
 # Disable annoying audio bell. Thanks to Sebastian Rachuj.
 xset b off
 
+# Load settings for X programs. Xdefaults is deprecated.
+xrdb "$HOME/.Xresources"
+
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
     if installed hsetroot; then
@@ -132,9 +127,11 @@ if installed redshift; then
     redshift -l 49.9:10.9 -t 5500:4500 >/dev/null &
 fi
 
-# Automatically lock the screen after x minutes of inactivity if `xautolock`
-# is available. Warn if locker wasn't found.
-if installed xautolock; then
+# Automatically lock the screen after x minutes of inactivity if
+# `xscreensaver` or `xautolock` is available. Warn if no locker was found.
+if installed xscreensaver; then
+    xscreensaver &
+elif installed xautolock; then
     if installed "$screen_locker"; then
         xautolock -secure -time "$screen_lock_time" -locker "$screen_locker" &
     else
@@ -144,21 +141,25 @@ elif test -n "$screen_lock_force"; then
     error "'xautolock' not found. Auto lock won't work!"
 fi
 
-# Use compton to get transparent windows. See ~/.Xdefaults for configuration
+
+# Use compton to get transparent windows. See ~/.Xresources for configuration
 # of urxvt.
 if installed compton; then
     compton &
+# xcompmgr as fallback.
+elif installed xcompmgr; then
+    xcompmgr &
 fi
 
 
-# My window managers doesn't start a terminal emulator on its own, start one
+# My window manager doesn't start a terminal emulator on its own, start one
 # when I login.
 (urxvt || rxvt || xterm) &
 
 # Start window manager.
 failed=
 if installed herbstluftwm; then
-    herbstluftwm --locked >~/.config/herbstluftwm/log 2>&1 || failed=1
+    herbstluftwm --locked >"$HOME/.config/herbstluftwm/log" 2>&1 || failed=1
 elif installed xmonad; then
     xmonad || failed=1
 elif installed stumpwm; then
@@ -185,4 +186,6 @@ if test -x /usr/bin/ssh-agent; then
     # No `eval` necessary, we terminate anyway.
 fi
 # Kill remaining background processes.
-kill $background_pids
+if test -n "$background_pids"; then
+    kill $background_pids
+fi