use set -eu

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 858cbaa1320ab6500fa184f000bbfa10b2a65738..8a649a144ec5865b6d445e86d6a984ce498d6b5b 100755 (executable)
--- 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 ~/.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