X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=4e5f7bbefe217598697ae93d1d18bc300b3bea41;hb=73ff664c0b33699029cab0f6c40c10cc78e90a04;hp=475da6ed98a4c2e6143f6f7a2e25ecd21cd6a486;hpb=de57a54e54230179017cdea80b8bed47c6042ce6;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 475da6e..4e5f7bb 100755
--- a/xinitrc
+++ b/xinitrc
@@ -2,40 +2,61 @@
 
 # startx configuration file.
 
+# Copyright (C) 2011-2012  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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 
 # Start ssh-agent if we have private keys, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
-if [ -x /usr/bin/ssh-agent -a -f "$HOME/.ssh/id_rsa" ]; then
-    eval `ssh-agent`
+if 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`
 fi
 
 # Use a black background for the root window.
 xsetroot -solid black
 
 # Force English keyboard layout.
-if [ -x /usr/bin/setxkbmap ]; then
+if test -x /usr/bin/setxkbmap; then
     setxkbmap us
 fi
 
 # Use my X11 key bindings.
-xmodmap ~/.xmodmaprc
+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 [ -f ~/.background ]; then
-    # But not on slow machines in the university.
-    HOSTNAME=`hostname`
-    if [ "x`echo $HOSTNAME | grep faui0sr`" = x ]; then
-        if [ -x /usr/bin/hsetroot ]; then
-            hsetroot -full ~/.background
-        elif [ -x /usr/bin/feh ]; then
-            feh --bg-scale ~/.background
-        fi
+if test -f "$HOME/.background" && test -n $set_background; then
+    if test -x /usr/bin/hsetroot; then
+        hsetroot -full "$HOME/.background"
+    elif test -x /usr/bin/feh; then
+        feh --bg-scale "$HOME/.background"
     fi
 fi
 
-# Display reminders.
-if [ -x /usr/bin/remind -a -f ~/.reminders ]; then
-    remind -z1 -k'.shell/bin/notify.py %s &' ~/.reminders &
+# Display timed reminders and recheck the file for changes every minute (-z1).
+if test -x /usr/bin/remind && test -f "$HOME/.reminders"; then
+    remind -z1 -k'.shell/bin/notify.py %s &' "$HOME/.reminders" &
 fi
 
 # Start XMonad.