From bfcc96d54881f5846b5d6f1a8c0a67d949621f8c Mon Sep 17 00:00:00 2001
From: Lyall Cooper <lyallcooper@gmail.com>
Date: Sat, 3 Sep 2016 18:29:46 -0700
Subject: [PATCH] Add Colemak layout to keyboard-layout layer

---
 layers/+intl/keyboard-layout/README.org | 15 ++++++---------
 layers/+intl/keyboard-layout/config.el  | 11 ++++++++++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/layers/+intl/keyboard-layout/README.org b/layers/+intl/keyboard-layout/README.org
index 7b1957d53..a2877c2b6 100644
--- a/layers/+intl/keyboard-layout/README.org
+++ b/layers/+intl/keyboard-layout/README.org
@@ -13,7 +13,6 @@
    - [[#bepo][bepo]]
    - [[#dvorak][dvorak]]
    - [[#colemak][colemak]]
-     - [[#remapped-keys][Remapped Keys]]
  - [[#package-configurations][Package Configurations]]
  - [[#keybindings][Keybindings]]
  - [[#sources][Sources]]
@@ -151,14 +150,11 @@ will remap keybindings for the =dvorak-programmer= variant.
 [[file:img/dvorak-keymap.png]]
 
 ** colemak
-   =colemak= is a keyboard layout designed for touch typing in English.
+=colemak= is a modern alternative to the QWERTY and =dvorak= layouts. It is
+designed for efficient and ergonomic touch typing in English. More info can be
+found at the [[https://colemak.com/][Colemak website]].
 
-   [[file:img/colemak-layout.png]]
-
-*** Remapped Keys
-
-    - ~avy~ and ~ace-window~ keys are remapped to the ~colemak~ home row
-    - ~evil-leader~ is also remapped to ~tn~
+[[file:img/colemak-layout.png]]
 
 * Package Configurations
 The available configurations are:
@@ -198,4 +194,5 @@ So the price you have to pay is the absence of a keybindings list.
 * Sources
 The keyboard-layout logo is coming from [[https://openclipart.org/detail/202777/keyboard-layout][openclipart.org]] and is under the public
 domain. The bepo logo and the keymap images are coming from the [[http://bepo.fr/][bepo]] official
-website. They are licensed under the [[http://creativecommons.org/licenses/by-sa/3.0/deed.en][CC-BY-SA]].
+website.  The Colemak keyboard layout image is from [[https://en.wikipedia.org/wiki/File:KB_US-Colemak.svg][Wikipedia]]. They are all
+licensed under the [[http://creativecommons.org/licenses/by-sa/3.0/deed.en][CC-BY-SA]].
diff --git a/layers/+intl/keyboard-layout/config.el b/layers/+intl/keyboard-layout/config.el
index 795ce2c44..bfe615783 100644
--- a/layers/+intl/keyboard-layout/config.el
+++ b/layers/+intl/keyboard-layout/config.el
@@ -58,7 +58,16 @@ any case.")
                ("h" . "h")
                ("j" . "t")
                ("k" . "n")
-               ("l" . "s"))))
+               ("l" . "s")))
+    (colemak . (("h" . "h")
+                ("n" . "j")
+                ("e" . "k")
+                ("i" . "l")
+                ;;
+                ("h" . "h")
+                ("j" . "n")
+                ("k" . "e")
+                ("l" . "i"))))
   "The base rebinding map. Dots should be read as `will behave
   as'. It should be a bidirectional mapping, i.e. all present
   keys should be once in each column.")