zshenv: ignore gpg on systems that don't have it

[dotfiles.git] / base / .xinitrc

diff --git a/base/.xinitrc b/base/.xinitrc
index 72661b433d652be032c87989b257d7ee081cbb13..8862d138f1440a7030c8f78a17db7f5356b86460 100644 (file)
--- a/base/.xinitrc
+++ b/base/.xinitrc
@@ -21,7 +21,7 @@ fi
 
 # redshift, root image
 redon &
-"$HOME/.fehbg"
+wall &
 
 # Xorg settings
 xset r rate 290 26 &
@@ -29,8 +29,8 @@ xset m 1/1 0 &
 xset s off
 xset dpms 0 0 600
 
-find -L "${XDG_DATA_HOME:-~/share}/fonts" -type d -mindepth 1 -maxdepth 1 | while read -r x; do
-       xset +fp $x/
+find -L "${XDG_DATA_HOME:-~/share}/fonts" -type d -mindepth 1 -maxdepth 2 | while read -r x; do
+       [ -f "$x/fonts.dir" ] && xset +fp $x
 done
 xset fp rehash
 
@@ -50,7 +50,7 @@ xautolock -time 10 -locker "$HOME/bin/lck" &
 xbanish &
 eval `ssh-agent`
 
-if [ -z "$TERMINAL" -a \( -x /usr/bin/urxvtd -o -x /usr/local/bin/urxvtd \) ]; then
+if [ -z "$TERMINAL" -a \( -x $(which -a urxvtd | head -1) \) ]; then
        for i in 1 2; do
                # try to start client twice, once before checking for daemon
                # and another after trying to start it