X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=d60a2ec4acd26baf65647e3b133b7970326a1467;hb=4e97ba52cc07938d19cc8919fa462651d9a4a84d;hp=1c586bc66db0ae9197581f5d7860db637b70e3df;hpb=1727213ce076b43f51d004c97e04361c50d05cb5;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
old mode 100644
new mode 100755
index 1c586bc..d60a2ec
--- a/xinitrc
+++ b/xinitrc
@@ -1,13 +1,33 @@
+#!/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
 
-# Start stumpwm.
-exec stumpwm
+# 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
+    fi
+fi
+
+# Start XMonad.
+xmonad
 
 # vim: ft=sh