xscreensaver: add and use

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 8a649a144ec5865b6d445e86d6a984ce498d6b5b..0f3aa1e2eae0633f2c565f31166cf840db113760 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -103,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
@@ -129,9 +129,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
@@ -151,14 +153,14 @@ elif installed xcompmgr; then
 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 +187,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