fi
-# Start ssh-agent if no agent is running and we have private keys, thanks to
+# Start ssh-agent if no agent is running, thanks to
# http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
-if test -z "$SSH_AGENT_PID" \
- && test -x /usr/bin/ssh-agent \
- && test -f "$HOME/.ssh/id_rsa"; then
+if test -z "$SSH_AGENT_PID" && test -x /usr/bin/ssh-agent; then
# -s to force bourne shell output. This file is a bourne shell script even
# if the environment might suggest otherwise.
eval `/usr/bin/ssh-agent -s` >/dev/null
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