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

diff --git a/xinitrc b/xinitrc
index 858cbaa..ca31589 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
 
@@ -108,6 +102,9 @@ xmodmap -e 'keycode 94 = grave asciitilde'
 # Disable annoying audio bell. Thanks to Sebastian Rachuj.
 xset b off
 
+# Load settings for 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
@@ -144,10 +141,13 @@ 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
 
 
@@ -158,7 +158,7 @@ fi
 # 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 +185,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