]> ruderich.org/simon Gitweb - config/dotfiles.git/blobdiff - xinitrc
xinitrc: Force English keyboard layout.
[config/dotfiles.git] / xinitrc
diff --git a/xinitrc b/xinitrc
old mode 100644 (file)
new mode 100755 (executable)
index 6a90254..5353d0a
--- 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.