X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=35bbe22f6157952d17fd9bf583f040198f3598ee;hb=429ce4dc8ecc960043dc0258bd0f795ef66e62ba;hp=7d3fdc697113c459e97975df1d945ab6b52d7e5f;hpb=80ec2902478cf11da5737951f104f55918837dd7;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 7d3fdc6..35bbe22 100755
--- a/xinitrc
+++ b/xinitrc
@@ -18,9 +18,18 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+# Some systems don't set the LANG environment variable when starting xinitrc,
+# this causes problems for rxvt-unicode-256color which fails to display UTF-8
+# characters correctly when LANG is missing and for notify.py which also needs
+# LANG set (for Python's decode() function). Therefore set it here, might be
+# overwritten by shell setup scripts.
+LANG=en_US.UTF-8
+export LANG
+
+
 # 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
+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`
@@ -30,29 +39,35 @@ fi
 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"
+        # --no-fehbg is only available in recent feh releases.
+        rm -f "$HOME/.fehbg"
     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.