xinitrc: Minor documentation update.

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index a18974c02fb788aee3f7b482b3fa2fc58b14e1b4..496295156224ed2afced300e785bbe7eabefda4a 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -2,7 +2,7 @@
 
 # startx configuration file.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  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
@@ -27,6 +27,11 @@ LANG=en_US.UTF-8
 export LANG
 
 
+installed() {
+    type "$1" >/dev/null 2>&1
+}
+
+
 # Start ssh-agent if 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
@@ -39,7 +44,7 @@ fi
 xsetroot -solid black
 
 # Force English keyboard layout.
-if test -x /usr/bin/setxkbmap; then
+if installed setxkbmap; then
     setxkbmap us
 fi
 
@@ -56,9 +61,9 @@ fi
 
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
-    if test -x /usr/bin/hsetroot; then
+    if installed hsetroot; then
         hsetroot -full "$HOME/.background"
-    elif test -x /usr/bin/feh; then
+    elif installed feh; then
         feh --bg-scale "$HOME/.background"
         # Remove the unnecessary ~/.fehbg file created by `feh`. I don't want
         # to restore the background, I just run `feh` on each startx run.
@@ -68,11 +73,18 @@ if test -f "$HOME/.background" && test -n "$set_background"; then
 fi
 
 # Display timed reminders and recheck the file for changes every minute (-z1).
-if test -x /usr/bin/remind && test -f "$HOME/.reminders"; then
+if installed remind && test -f "$HOME/.reminders"; then
     remind -z1 -k'.shell/bin/notify.py %s &' "$HOME/.reminders" &
 fi
 
-# Start XMonad.
-xmonad
+# Set color temperature of display according to time of day.
+if installed redshift; then
+    redshift -l 49.9:10.9 -t 5500:4500 &
+fi
 
-# vim: ft=sh
+
+# XMonad doesn't start a shell on its own, start one when I login.
+(urxvt || rxvt || xterm) &
+
+# Start window manager.
+xmonad