X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=ae38da63cc2af9ceb3c9d2e95f6e2b45ad594430;hb=b71680c55e6e492ed008f8ec5af3bf169b272f09;hp=0f3aa1e2eae0633f2c565f31166cf840db113760;hpb=cfbe0fa5363aa36caa133e2387bafcb8eb3f7d56;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 0f3aa1e..ae38da6 100755
--- a/xinitrc
+++ b/xinitrc
@@ -54,12 +54,11 @@ background_pids=
 #
 # Default to use a background image.
 set_background=yes
-# Default to display a warning if `xautolock` is not available.
+# Default to display a warning if no screen locker is not available.
 screen_lock_force=yes
-# Lock screen after x minutes of inactivity, requires `xautolock` to be
-# installed.
+# Lock screen after x minutes of inactivity.
 screen_lock_time=3
-# Locker program to lock the screen, used below with `xautolock`.
+# Locker program to lock the screen (with xautolock).
 screen_locker=xtrlock
 
 # Load settings for the local system.
@@ -68,11 +67,9 @@ if test -f "$HOME/.xinitrc.local"; then
 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
@@ -96,13 +93,13 @@ if xmodmap | grep -E '^lock.*Caps_Lock' >/dev/null; then
     xmodmap -e 'add Control = Control_L'
 fi
 # Move grave and tilde next to left shift key. This setting may only be
-# necessary because of my German keyboard which I use with English settings.
+# necessary because of my German keyboard which I use with an English layout.
 xmodmap -e 'keycode 94 = grave asciitilde'
 
 # Disable annoying audio bell. Thanks to Sebastian Rachuj.
 xset b off
 
-# Load settings for programs. Xdefaults is deprecated.
+# Load settings for X programs. Xdefaults is deprecated.
 xrdb "$HOME/.Xresources"
 
 # Change the background if available.
@@ -129,20 +126,14 @@ 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
-# `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
-        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!"
+
+# Start best available screen locker.
+xlockscreen=`"$HOME/.xlockscreen" start "$screen_lock_time" "$screen_locker"`
+if test $? -ne 0 && test -n "$screen_lock_force"; then
+    error "$xlockscreen"
 fi
 
+
 # Use compton to get transparent windows. See ~/.Xresources for configuration
 # of urxvt.
 if installed compton; then
@@ -160,7 +151,7 @@ fi
 # Start window manager.
 failed=
 if installed herbstluftwm; then
-    herbstluftwm --locked >"$HOME/.config/herbstluftwm/log" 2>&1 || failed=1
+    herbstluftwm --locked || failed=1
 elif installed xmonad; then
     xmonad || failed=1
 elif installed stumpwm; then