From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 26 Oct 2016 15:40:08 +0000 (+0100)
Subject: Merge branch 'master' into beryllium
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=30004b962984085b3dc8fad9e2e538abd4c79ec4;hp=84769f191fb4c0fa07637f6fcc2b4a768eac0812;p=max%2Fdotfiles.git

Merge branch 'master' into beryllium
---

diff --git a/X/.xinitrc b/X/.xinitrc
index 1a86c7f..7897989 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,7 +16,12 @@ fi
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
 
-setxkbmap gb
+setxkbmap -variant colemak gb
+xmodmap -e "keycode 66 = Control_L Control_L Control_L Control_L"
+xmodmap -e "add Control = Control_L Control_R"
+
+# Set screen layout
+xrandr --output VGA1 --right-of HDMI1
 
 
 # Set java font option