X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=68b52b7152bff93aa96cced487ffb7dfd5ed3177;hb=861842615ae39815ae9e5ee9090a82f22ea65bf3;hp=ccc2b7d62938f40ef889ea94fad69f9a35949082;hpb=5aea6258d6cd8778fb10ef77ea707582fc56312f;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index ccc2b7d..68b52b7 100755
--- a/xinitrc
+++ b/xinitrc
@@ -2,7 +2,7 @@
 
 # startx configuration file.
 
-# Copyright (C) 2011-2013  Simon Ruderich
+# Copyright (C) 2011-2014  Simon Ruderich
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,12 +24,6 @@
 # LANG set (for Python's decode() function). Therefore load my general shell
 # environment which also includes $LANG.
 if test -f "$HOME/.shell/env"; then
-    # Debug function used in ~/.shell/env.
-    source_debug() {
-        # Do nothing.
-        :
-    }
-
     . "$HOME/.shell/env"
 fi
 
@@ -42,7 +36,7 @@ error() {
         xmessage "$@" &
     else
         # Log message to a file which is displayed by my Zsh setup on startup.
-        echo "$*" >> "$HOME/.xinitrc.errors"
+        printf '%s\n' "$*" >>"$HOME/.xinitrc.errors"
     fi
 }
 # Save PID of the most recently started background process. Used to terminate
@@ -74,11 +68,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
@@ -92,8 +84,8 @@ if installed setxkbmap; then
     setxkbmap us
 fi
 
-# Use the Caps lock as Ctrl because it easier to reach and very useful for all
-# programs. Caps lock is removed completely. Thanks to
+# Use the Caps lock as Ctrl because it's easier to reach and very useful for
+# all programs. Caps lock is removed completely. Thanks to
 # http://snarfed.org/space/switch%20control%20and%20caps%20lock
 if xmodmap | grep -E '^lock.*Caps_Lock' >/dev/null; then
     xmodmap -e 'remove Lock = Caps_Lock'
@@ -105,6 +97,12 @@ fi
 # necessary because of my German keyboard which I use with English settings.
 xmodmap -e 'keycode 94 = grave asciitilde'
 
+# Disable annoying audio bell. Thanks to Sebastian Rachuj.
+xset b off
+
+# Load settings for programs. Xdefaults is deprecated.
+xrdb "$HOME/.Xresources"
+
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
     if installed hsetroot; then
@@ -129,9 +127,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
@@ -141,12 +141,40 @@ elif test -n "$screen_lock_force"; then
     error "'xautolock' not found. Auto lock won't work!"
 fi
 
+# Use compton to get transparent windows. See ~/.Xresources for configuration
+# of urxvt.
+if installed compton; then
+    compton &
+# xcompmgr as fallback.
+elif installed xcompmgr; then
+    xcompmgr &
+fi
+
 
-# XMonad doesn't start a terminal emulator on its own, start one when I login.
+# My window manager doesn't start a terminal emulator on its own, start one
+# when I login.
 (urxvt || rxvt || xterm) &
 
 # Start window manager.
-xmonad
+failed=
+if installed herbstluftwm; then
+    herbstluftwm --locked >"$HOME/.config/herbstluftwm/log" 2>&1 || failed=1
+elif installed xmonad; then
+    xmonad || failed=1
+elif installed stumpwm; then
+    stumpwm || failed=1
+else
+    failed='no window manager found'
+fi
+# Fallback in case my window manager failed to start. Otherwise X terminates
+# the session immediately (because xinitrc finishes).
+if test -n "$failed"; then
+    if test x"$failed" = x1; then
+        failed='failed to start window manager'
+    fi
+    error "$failed (spawning fallback terminal)"
+    urxvt || rxvt || xterm
+fi
 
 
 # Cleanup.
@@ -157,4 +185,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