From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 24 Oct 2016 16:21:31 +0000 (+0100)
Subject: Merge branch 'master' into beryllium
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=0a4160b7d8128ad2d73671654df1599ef0a64c77;hp=4669b53a0897b6229cde9fec9474871fe14b8f79;p=max%2Fdotfiles.git

Merge branch 'master' into beryllium
---

diff --git a/X/.xinitrc b/X/.xinitrc
index 1a86c7f..857c4b0 100644
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,7 +16,10 @@ fi
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
 
-setxkbmap gb
+setxkbmap -variant colemak gb
+
+# Set screen layout
+xrandr --output VGA1 --right-of HDMI1
 
 
 # Set java font option
@@ -26,4 +29,6 @@ feh --bg-scale ~/Pictures/background.jpg&
 
 xset -b
 
+setxkbmap -option 'ctrl:nocaps'
+
 exec /usr/bin/ratpoison