xinitrc: Write errors to ~/.xinitrc.errors if xmessage is not installed.

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 696230a455b997b61d9a7d669e767c85ac7a51bf..fc4582de641725f94539543ff680abbdb08df034 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -37,6 +37,39 @@ 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
+# yet figured out why.
+save_background_pid() {
+    background_pids="$background_pids $!"
+}
+background_pids=
+
+
+# Options, can be modified in ~/.xinitrc.local. To disable a boolean option
+# set it to an empty value.
+#
+# Default to use a background image.
+set_background=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
+    . "$HOME/.xinitrc.local"
+fi
 
 
 # Start ssh-agent if we have private keys, thanks to
@@ -58,14 +91,6 @@ fi
 # Use my X11 key bindings.
 xmodmap "$HOME/.xmodmaprc"
 
-# Default to use a background image. Can be disabled in .xinitrc.local.
-set_background=yes
-
-# Load settings for the local system.
-if test -f "$HOME/.xinitrc.local"; then
-    . "$HOME/.xinitrc.local"
-fi
-
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
     if installed hsetroot; then
@@ -82,6 +107,7 @@ fi
 # Display timed reminders and recheck the file for changes every minute (-z1).
 if installed remind && test -f "$HOME/.reminders"; then
     remind -z1 -k'.shell/bin/notify.py %s &' "$HOME/.reminders" &
+    save_background_pid
 fi
 
 # Set color temperature of display according to time of day.
@@ -89,9 +115,29 @@ 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
+fi
+
 
 # XMonad doesn't start a terminal emulator on its own, start one when I login.
 (urxvt || rxvt || xterm) &
 
 # Start window manager.
 xmonad
+
+# Cleanup.
+#
+# Kill ssh-agent to prevent unused background processes.
+if test -x /usr/bin/ssh-agent; then
+    /usr/bin/ssh-agent -k >/dev/null
+    # No `eval` necessary, we terminate anyway.
+fi
+# Kill remaining background processes.
+kill $background_pids