X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=X%2F.xinitrc;h=a031825e5dcc5703b8da221fef55f1fa27537748;hb=8f540bfb294f5fadf9e15d85c668c8dda3ced64c;hp=a0f6e2a8aab0c1e9a4178eec6aa79fd7662032a0;hpb=4c41705a592ee0ac5088a6742226574782e1025e;p=max%2Fdotfiles.git

diff --git a/X/.xinitrc b/X/.xinitrc
index a0f6e2a..a031825 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -15,10 +15,29 @@ fi
 
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
+if [ -f ~/.Xresources.$HOSTNAME ]; then
+    xrdb -merge ~/.Xresources.$HOSTNAME &> /dev/null
+fi
 
-
-# Set caps lock as control to avoid emacs pinky
-setxkbmap -option ctrl:nocaps
+# Set keyboard layout
+case $HOSTNAME in
+    palladium|beryllium)
+	setxkbmap -variant colemak gb
+	xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+	xmodmap -e "keycode 135 = Control_R Control_R Control_R Control_R"
+	xmodmap -e "add Control = Control_L Control_R"
+	;;
+    *)
+esac
+
+# Set screen layout
+case $HOSTNAME in
+    beryllium)
+	xrandr --output VGA1 --right-of HDMI1
+	;;
+    *)
+	;;
+esac
 
 # Set java font option
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"