Merge branch 'master' into beryllium

diff --git a/X/.xinitrc b/X/.xinitrc
index 1a86c7fc988fab9cc81b8f5d6f98da173fd013e1..78979895a75411806caf8260f8b8eabb4d595390 100644 (file)
--- 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