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

diff --git a/xinitrc b/xinitrc
index 201e636..35bbe22 100755
--- a/xinitrc
+++ b/xinitrc
@@ -18,6 +18,15 @@
 # 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 test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then
@@ -37,16 +46,22 @@ fi
 # Use my X11 key bindings.
 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 test -f "$HOME/.background"; then
-    # But not on slow machines in the university.
-    HOSTNAME=`hostname`
-    if test "x`echo $HOSTNAME | grep faui0sr`" = x; 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
+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