X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=5353d0a8ca429c822c3f442f2e071cd36c8f7e65;hb=4cdb61d9e38e39c81051ba8519eb674503c31023;hp=6a9025463be38986c376bbbf6286dd8c1cdfba6c;hpb=cda680624c7715a9ac500b17f6edfb9b40ff8385;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 6a90254..5353d0a 100755
--- a/xinitrc
+++ b/xinitrc
@@ -1,15 +1,26 @@
+#!/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
-    hsetroot -full ~/.background
+    if [ -x /usr/bin/hsetroot ]; then
+        hsetroot -full ~/.background
+    elif [ -x /usr/bin/feh ]; then
+        feh --bg-scale ~/.background
+    fi
 fi
 
 # Start XMonad.