From: Simon Ruderich <simon@ruderich.org>
Date: Wed, 18 May 2011 20:38:32 +0000 (+0200)
Subject: Merge remote branch 'asp/master'
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=80f9a7824fee91b661f53001c49e7a92a40a7395;hp=e43aac66d71d0638c5220e01abbe42d0c957e882;p=config%2Fdotfiles.git

Merge remote branch 'asp/master'
---

diff --git a/xinitrc b/xinitrc
index 2a6866b..d60a2ec 100755
--- a/xinitrc
+++ b/xinitrc
@@ -1,18 +1,29 @@
+#!/bin/sh
+
 # startx configuration file.
 
 
 # Use a black background for the root window.
 xsetroot -solid black
 
+# Force English keyboard layout.
+if [ -x /usr/bin/setxkbmap ]; then
+    setxkbmap us
+fi
+
 # Use my X11 key bindings.
 xmodmap ~/.xmodmaprc
 
 # Change the background if available.
 if [ -f ~/.background ]; then
-    if [ -x /usr/bin/hsetroot ]; then
-        hsetroot -full ~/.background
-    elif [ -x /usr/bin/feh ]; then
-        feh --bg-scale ~/.background
+    # 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
     fi
 fi