X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=ca31589dd7d3e24335595fc4235341bb34c56f05;hb=7b8e4ac9f289290006012be73f2a3ba7c52b7420;hp=c4dd1c207c902d4b8945f4440849e47fdde888e2;hpb=6075dcef09a8871939dafbc29476bef2ed28c7a1;p=config%2Fdotfiles.git diff --git a/xinitrc b/xinitrc index c4dd1c2..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 @@ -109,7 +103,7 @@ xmodmap -e 'keycode 94 = grave asciitilde' xset b off # Load settings for programs. Xdefaults is deprecated. -xrdb ~/.Xresources +xrdb "$HOME/.Xresources" # Change the background if available. if test -f "$HOME/.background" && test -n "$set_background"; then @@ -151,6 +145,9 @@ fi # of urxvt. if installed compton; then compton & +# xcompmgr as fallback. +elif installed xcompmgr; then + xcompmgr & fi @@ -161,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 @@ -188,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