From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 31 Oct 2016 09:26:33 +0000 (+0000)
Subject: Merge branch 'beryllium'
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=cbd9b2c8b6baeb1b31f1d0406e3353dfebd85baf;hp=84769f191fb4c0fa07637f6fcc2b4a768eac0812;p=max%2Fdotfiles.git

Merge branch 'beryllium'
---

diff --git a/X/.xinitrc b/X/.xinitrc
index 1a86c7f..0c2dc6b 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,8 +16,25 @@ fi
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
 
-setxkbmap gb
-
+# 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"