From 1498f49bdf1b3caf5a88de23d2e6cc8e7cb31413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= <jfdess@gmail.com>
Date: Wed, 10 Jan 2024 22:19:48 -0500
Subject: [PATCH] add colemak layer

---
 config/constants.h               |  11 +-
 config/corne.keymap              |  12 +++
 config/urchin.keymap             |  14 ++-
 images/keymaps/urchin_keymap.svg | 176 ++++++++++++++++++++++++++++---
 keymap-drawer/urchin_keymap.yaml |  35 ++++++
 5 files changed, 228 insertions(+), 20 deletions(-)

diff --git a/config/constants.h b/config/constants.h
index 06fc6a3..451fe99 100644
--- a/config/constants.h
+++ b/config/constants.h
@@ -8,11 +8,12 @@
 // Must match order in which they are defined
 #define DEF 0
 #define ACC 1
-#define SYM 2
-#define NAV 3
-#define NUM 4
-#define MOU 5
-#define GAM 6
+#define COL 2
+#define SYM 3
+#define NAV 4
+#define NUM 5
+#define MOU 6
+#define GAM 7
 
 // Modifier keys
 #define GL LGUI
diff --git a/config/corne.keymap b/config/corne.keymap
index 2ee2231..2a971c5 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -42,6 +42,18 @@ ZMK_LAYER_5COL(accent,
 //                         ╰───────────┴────────────┴────────────╯ ╰───────────┴─────────────┴─────────────╯
 )
 
+ZMK_LAYER(colemak,
+// ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
+     &kp Q       &kp W       &kp F       &kp P        &kp B          &kp J       &kp L         &kp U         &kp Y        &kp SEMI
+// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
+     &hml GL A   &hml AL R   &hml CL S   &hml SL T    &kp G          &kp M       &hmr SL N     &hmr CL E     &hmr AL I    &hmr GL O
+// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
+     &kp Z       &kp X       &kp C       &kp D        &kp V          &kp K       &kp H         &kp COMMA     &kp DOT      XXX
+// ╰───────────┴───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┴────────────╯
+                             ___         ___          ___            ___         ___           ___
+//                         ╰───────────┴────────────┴────────────╯ ╰───────────┴─────────────┴─────────────╯
+)
+
 ZMK_LAYER_5COL(symbol,
 // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
      &kp HASH    &kp AT      &kp LBRAC   &kp RBRAC    &kp PLUS       XXX         &kp TILDS     &GRA          &kp DLLR     XXX
diff --git a/config/urchin.keymap b/config/urchin.keymap
index 99f8b66..73929ea 100644
--- a/config/urchin.keymap
+++ b/config/urchin.keymap
@@ -27,7 +27,7 @@ ZMK_LAYER(qwerty,
      &kp Z       &kp X       &kp C       &kp V        &kp B          &kp N       &kp M         &kp COMMA     &kp DOT      &to ACC
 // ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯
                                         &lt NAV RET  &num_esc_clk    &bspc_del  &sp_nbsp_sym
-//                                     ╰───────────┴─────────────╯ ╰───────────┴─────────────╯
+//                                     ╰────────────┴────────────╯ ╰───────────┴─────────────╯
 )
 
 ZMK_LAYER(accent,
@@ -42,6 +42,18 @@ ZMK_LAYER(accent,
 //                                     ╰────────────┴────────────╯ ╰───────────┴─────────────╯
 )
 
+ZMK_LAYER(colemak,
+// ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
+     &kp Q       &kp W       &kp F       &kp P        &kp B          &kp J       &kp L         &kp U         &kp Y        &kp SEMI
+// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
+     &hml GL A   &hml AL R   &hml CL S   &hml SL T    &kp G          &kp M       &hmr SL N     &hmr CL E     &hmr AL I    &hmr GL O
+// ├───────────┼───────────┼───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┼────────────┼────────────┤
+     &kp Z       &kp X       &kp C       &kp D        &kp V          &kp K       &kp H         &kp COMMA     &kp DOT      XXX
+// ╰───────────┴───────────┴───────────┼────────────┼────────────┤ ├───────────┼─────────────┼─────────────┴────────────┴────────────╯
+                                         ___          ___            ___         ___
+//                                     ╰────────────┴────────────╯ ╰───────────┴─────────────╯
+)
+
 ZMK_LAYER(symbol,
 // ╭───────────┬───────────┬───────────┬────────────┬────────────╮ ╭───────────┬─────────────┬─────────────┬────────────┬────────────╮
      &kp HASH    &kp AT      &kp LBRAC   &kp RBRAC    &kp PLUS       XXX         &kp TILDS     &GRA          &kp DLLR     XXX
diff --git a/images/keymaps/urchin_keymap.svg b/images/keymaps/urchin_keymap.svg
index b0dd54d..7f2583f 100644
--- a/images/keymaps/urchin_keymap.svg
+++ b/images/keymaps/urchin_keymap.svg
@@ -1,4 +1,4 @@
-<svg width="747" height="3362" viewBox="0 0 747 3362" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="747" height="3698" viewBox="0 0 747 3698" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <defs>/* start glyphs */
 <svg id="bt-clear">
 <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-bluetooth-x" viewBox="0 0 32 32" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
@@ -844,7 +844,155 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 690)" class="layer-symbol">
+<g transform="translate(30, 690)" class="layer-colemak">
+<text x="0" y="28" class="label">colemak</text>
+<g transform="translate(0, 56)">
+<g transform="translate(28, 80)" class="key keypos-0">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">Q</text>
+</g>
+<g transform="translate(84, 45)" class="key keypos-1">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">W</text>
+</g>
+<g transform="translate(140, 28)" class="key keypos-2">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">F</text>
+</g>
+<g transform="translate(196, 44)" class="key keypos-3">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">P</text>
+</g>
+<g transform="translate(252, 52)" class="key keypos-4">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">B</text>
+</g>
+<g transform="translate(420, 52)" class="key keypos-5">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">J</text>
+</g>
+<g transform="translate(476, 44)" class="key keypos-6">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">L</text>
+</g>
+<g transform="translate(532, 28)" class="key keypos-7">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">U</text>
+</g>
+<g transform="translate(588, 45)" class="key keypos-8">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">Y</text>
+</g>
+<g transform="translate(644, 80)" class="key keypos-9">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">;</text>
+</g>
+<g transform="translate(28, 136)" class="key keypos-10">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">A</text>
+<text x="0" y="23" class="key hold">GUI</text>
+</g>
+<g transform="translate(84, 101)" class="key keypos-11">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">R</text>
+<text x="0" y="23" class="key hold">ALT</text>
+</g>
+<g transform="translate(140, 84)" class="key keypos-12">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">S</text>
+<text x="0" y="23" class="key hold">CTRL</text>
+</g>
+<g transform="translate(196, 100)" class="key keypos-13">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">T</text>
+<text x="0" y="23" class="key hold">SHIFT</text>
+</g>
+<g transform="translate(252, 108)" class="key keypos-14">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">G</text>
+</g>
+<g transform="translate(420, 108)" class="key keypos-15">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">M</text>
+</g>
+<g transform="translate(476, 100)" class="key keypos-16">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">N</text>
+<text x="0" y="23" class="key hold">SHIFT</text>
+</g>
+<g transform="translate(532, 84)" class="key keypos-17">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">E</text>
+<text x="0" y="23" class="key hold">CTRL</text>
+</g>
+<g transform="translate(588, 101)" class="key keypos-18">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">I</text>
+<text x="0" y="23" class="key hold">ALT</text>
+</g>
+<g transform="translate(644, 136)" class="key keypos-19">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">O</text>
+<text x="0" y="23" class="key hold">GUI</text>
+</g>
+<g transform="translate(28, 192)" class="key keypos-20">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">Z</text>
+</g>
+<g transform="translate(84, 157)" class="key keypos-21">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">X</text>
+</g>
+<g transform="translate(140, 140)" class="key keypos-22">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">C</text>
+</g>
+<g transform="translate(196, 156)" class="key keypos-23">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">D</text>
+</g>
+<g transform="translate(252, 164)" class="key keypos-24">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">V</text>
+</g>
+<g transform="translate(420, 164)" class="key keypos-25">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">K</text>
+</g>
+<g transform="translate(476, 156)" class="key keypos-26">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">H</text>
+</g>
+<g transform="translate(532, 140)" class="key keypos-27">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">,</text>
+</g>
+<g transform="translate(588, 157)" class="key keypos-28">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+<text x="0" y="0" class="key tap">.</text>
+</g>
+<g transform="translate(644, 192)" class="key keypos-29">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key"/>
+</g>
+<g transform="translate(224, 238)" class="key trans keypos-30">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
+<text x="0" y="0" class="key trans tap">▽</text>
+</g>
+<g transform="translate(280, 252)" class="key trans keypos-31">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
+<text x="0" y="0" class="key trans tap">▽</text>
+</g>
+<g transform="translate(392, 252)" class="key trans keypos-32">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
+<text x="0" y="0" class="key trans tap">▽</text>
+</g>
+<g transform="translate(448, 238)" class="key trans keypos-33">
+<rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key trans"/>
+<text x="0" y="0" class="key trans tap">▽</text>
+</g>
+</g>
+</g>
+<g transform="translate(30, 1026)" class="layer-symbol">
 <text x="0" y="28" class="label">symbol</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -999,7 +1147,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1026)" class="layer-nav">
+<g transform="translate(30, 1362)" class="layer-nav">
 <text x="0" y="28" class="label">nav</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -1136,7 +1284,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1362)" class="layer-nums">
+<g transform="translate(30, 1698)" class="layer-nums">
 <text x="0" y="28" class="label">nums</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -1280,7 +1428,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 1698)" class="layer-mouse">
+<g transform="translate(30, 2034)" class="layer-mouse">
 <text x="0" y="28" class="label">mouse</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -1398,7 +1546,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2034)" class="layer-game">
+<g transform="translate(30, 2370)" class="layer-game">
 <text x="0" y="28" class="label">game</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 80)" class="key keypos-0">
@@ -1539,8 +1687,8 @@ path.combo {
 </g>
 </g>
 </g>
-<text x="30" y="2398" class="label">Combos</text>
-<g transform="translate(30, 2370)" class="layer-combopos-0">
+<text x="30" y="2734" class="label">Combos</text>
+<g transform="translate(30, 2706)" class="layer-combopos-0">
 <g transform="translate(0, 56)">
 <g transform="translate(28, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key  combo-separate"/>
@@ -1652,7 +1800,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(396, 2370)" class="layer-combopos-1">
+<g transform="translate(396, 2706)" class="layer-combopos-1">
 <g transform="translate(0, 56)">
 <g transform="translate(28, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key  combo-separate"/>
@@ -1764,7 +1912,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2625)" class="layer-combopos-2">
+<g transform="translate(30, 2961)" class="layer-combopos-2">
 <g transform="translate(0, 28)">
 <g transform="translate(28, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key  combo-separate"/>
@@ -1874,7 +2022,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(396, 2625)" class="layer-combopos-3">
+<g transform="translate(396, 2961)" class="layer-combopos-3">
 <g transform="translate(0, 28)">
 <g transform="translate(28, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key  combo-separate"/>
@@ -1986,7 +2134,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 2852)" class="layer-combopos-4">
+<g transform="translate(30, 3188)" class="layer-combopos-4">
 <g transform="translate(0, 28)">
 <g transform="translate(28, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key  combo-separate"/>
@@ -2099,7 +2247,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(396, 2852)" class="layer-combopos-5">
+<g transform="translate(396, 3188)" class="layer-combopos-5">
 <g transform="translate(0, 28)">
 <g transform="translate(28, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key  combo-separate"/>
@@ -2210,7 +2358,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 3079)" class="layer-combopos-6">
+<g transform="translate(30, 3415)" class="layer-combopos-6">
 <g transform="translate(0, 28)">
 <g transform="translate(28, 28)" class="key  combo-separate keypos-0">
 <rect rx="6" ry="6" x="-25" y="-25" width="50" height="50" class="key  combo-separate"/>
diff --git a/keymap-drawer/urchin_keymap.yaml b/keymap-drawer/urchin_keymap.yaml
index 133309a..d1d5ba9 100644
--- a/keymap-drawer/urchin_keymap.yaml
+++ b/keymap-drawer/urchin_keymap.yaml
@@ -70,6 +70,41 @@ layers:
   - {t: ▽, type: trans}
   - {t: ▽, type: trans}
   - {t: ▽, type: trans}
+  colemak:
+  - Q
+  - W
+  - F
+  - P
+  - B
+  - J
+  - L
+  - U
+  - Y
+  - ;
+  - {t: A, h: GUI}
+  - {t: R, h: ALT}
+  - {t: S, h: CTRL}
+  - {t: T, h: SHIFT}
+  - G
+  - M
+  - {t: N, h: SHIFT}
+  - {t: E, h: CTRL}
+  - {t: I, h: ALT}
+  - {t: O, h: GUI}
+  - Z
+  - X
+  - C
+  - D
+  - V
+  - K
+  - H
+  - ','
+  - .
+  - ''
+  - {t: ▽, type: trans}
+  - {t: ▽, type: trans}
+  - {t: ▽, type: trans}
+  - {t: ▽, type: trans}
   symbol:
   - '#'
   - '@'