xinitrc: Fix incorrect use of "$@" in error().

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index d242454b22d14415e0492b9013a73021ab88a542..f262caeb25e969f30054ba64f5dab1457326b369 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -37,6 +37,14 @@ fi
 installed() {
     type "$1" >/dev/null 2>&1
 }
+error() {
+    if installed xmessage; then
+        xmessage "$@" &
+    else
+        # Log message to a file which is displayed by my Zsh setup on startup.
+        echo "$*" >> "$HOME/.xinitrc.errors"
+    fi
+}
 # Save PID of the most recently started background process. Used to terminate
 # them when logging out to prevent unused background processes. On some
 # systems this is only necessary for some programs (like ssh-agent), haven't
@@ -52,6 +60,13 @@ background_pids=
 #
 # Default to use a background image.
 set_background=yes
+# Default to display a warning if `xautolock` is not available.
+screen_lock_force=yes
+# Lock screen after x minutes of inactivity, requires `xautolock` to be
+# installed.
+screen_lock_time=3
+# Locker program to lock the screen, used below with `xautolock`.
+screen_locker=xtrlock
 
 # Load settings for the local system.
 if test -f "$HOME/.xinitrc.local"; then
@@ -59,9 +74,11 @@ if test -f "$HOME/.xinitrc.local"; then
 fi
 
 
-# Start ssh-agent if we have private keys, thanks to
+# Start ssh-agent if no agent is running and we have private keys, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
-if 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 \
+        && test -f "$HOME/.ssh/id_rsa"; 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
@@ -102,6 +119,18 @@ 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
+    if installed "$screen_locker"; then
+        xautolock -secure -time "$screen_lock_time" -locker "$screen_locker" &
+    else
+        error "Locker '$screen_locker' not installed. Auto lock won't work!"
+    fi
+elif test -n "$screen_lock_force"; then
+    error "'xautolock' not found. Auto lock won't work!"
+fi
+
 
 # XMonad doesn't start a terminal emulator on its own, start one when I login.
 (urxvt || rxvt || xterm) &