From 8ad5f4d468f24cd88d7b28812340b0996394e76c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Dessureault?= <jfdess@gmail.com>
Date: Thu, 5 Sep 2024 22:40:40 -0400
Subject: [PATCH] feat: add nav toggle combo

---
 behaviors/combos_34.dtsi         |  3 ++
 behaviors/combos_36.dtsi         |  3 ++
 images/keymaps/urchin_keymap.svg | 64 ++++++++++++++++++++++----------
 keymap-drawer/config.yaml        |  9 ++++-
 keymap-drawer/urchin_keymap.yaml |  5 +++
 5 files changed, 63 insertions(+), 21 deletions(-)

diff --git a/behaviors/combos_34.dtsi b/behaviors/combos_34.dtsi
index 2ba739e..4c07d1a 100644
--- a/behaviors/combos_34.dtsi
+++ b/behaviors/combos_34.dtsi
@@ -21,3 +21,6 @@ ZMK_COMBO(ergol_qwerty_34, &to QWE, LH0 RH0, ERG)
 
 // QWERTY -> Ergo-L - Outer thumbs, active on QWERTY
 ZMK_COMBO(qwerty_ergol_34, &to ERG, LH1 RH1, QWE)
+
+// NAV Toggle - Left thumbs, active on all alpha layers & NAV
+ZMK_COMBO(nav_toggle_34, &tog NAV, LH0 LH1, QWE COL ERG NAV)
diff --git a/behaviors/combos_36.dtsi b/behaviors/combos_36.dtsi
index 68b6145..d5b0805 100644
--- a/behaviors/combos_36.dtsi
+++ b/behaviors/combos_36.dtsi
@@ -21,3 +21,6 @@ ZMK_COMBO(ergol_qwerty, &to QWE, LH0 RH0, ERG)
 
 // QWERTY -> Ergo-L - Outer thumbs, active on QWERTY
 ZMK_COMBO(qwerty_ergol, &to ERG, LH1 RH1, QWE)
+
+// NAV Toggle - Left thumbs, active on all alpha layers & NAV
+ZMK_COMBO(nav_toggle, &tog NAV, LH0 LH1, QWE COL ERG NAV)
diff --git a/images/keymaps/urchin_keymap.svg b/images/keymaps/urchin_keymap.svg
index 2695006..0fbf1d7 100644
--- a/images/keymaps/urchin_keymap.svg
+++ b/images/keymaps/urchin_keymap.svg
@@ -1,4 +1,4 @@
-<svg width="747" height="5025" viewBox="0 0 747 5025" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="747" height="5049" viewBox="0 0 747 5049" 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">
@@ -709,14 +709,20 @@ path.combo {
 <use href="#material:keyboard_tab" xlink:href="#material:keyboard_tab" x="415" y="284" height="14" width="14.0" class="combo tap glyph material:keyboard_tab"/>
 </g>
 <g class="combo combopos-5">
+<path d="M250,291 h23 a6.0,6.0 0 0 0 6.0,-6.0 v-22" class="combo"/>
+<path d="M250,291 h-23 a6.0,6.0 0 0 1 -6.0,-6.0 v-46" class="combo"/>
+<rect rx="6" ry="6" x="234" y="275" width="32" height="32" class="combo"/>
+<text x="250" y="291" class="combo tap">NAV</text>
+</g>
+<g class="combo combopos-6">
 <rect rx="6" ry="6" x="152" y="20" width="32" height="32" class="combo"/>
 <use href="#material:left_click" xlink:href="#material:left_click" x="161" y="29" height="14" width="14.0" class="combo tap glyph material:left_click"/>
 </g>
-<g class="combo combopos-6">
+<g class="combo combopos-7">
 <rect rx="6" ry="6" x="40" y="40" width="32" height="32" class="combo"/>
 <use href="#material:right_click" xlink:href="#material:right_click" x="49" y="49" height="14" width="14.0" class="combo tap glyph material:right_click"/>
 </g>
-<g class="combo combopos-7">
+<g class="combo combopos-8">
 <rect rx="6" ry="6" x="96" y="21" width="32" height="32" class="combo"/>
 <use href="#scroll" xlink:href="#scroll" x="105" y="30" height="14" width="14.0" class="combo tap glyph scroll"/>
 </g>
@@ -1034,14 +1040,20 @@ path.combo {
 </a><text x="336" y="199" class="combo hold">toggle</text>
 </g>
 <g class="combo combopos-6">
+<path d="M250,291 h23 a6.0,6.0 0 0 0 6.0,-6.0 v-22" class="combo"/>
+<path d="M250,291 h-23 a6.0,6.0 0 0 1 -6.0,-6.0 v-46" class="combo"/>
+<rect rx="6" ry="6" x="234" y="275" width="32" height="32" class="combo"/>
+<text x="250" y="291" class="combo tap">NAV</text>
+</g>
+<g class="combo combopos-7">
 <rect rx="6" ry="6" x="152" y="20" width="32" height="32" class="combo"/>
 <use href="#material:left_click" xlink:href="#material:left_click" x="161" y="29" height="14" width="14.0" class="combo tap glyph material:left_click"/>
 </g>
-<g class="combo combopos-7">
+<g class="combo combopos-8">
 <rect rx="6" ry="6" x="40" y="40" width="32" height="32" class="combo"/>
 <use href="#material:right_click" xlink:href="#material:right_click" x="49" y="49" height="14" width="14.0" class="combo tap glyph material:right_click"/>
 </g>
-<g class="combo combopos-8">
+<g class="combo combopos-9">
 <rect rx="6" ry="6" x="96" y="21" width="32" height="32" class="combo"/>
 <use href="#scroll" xlink:href="#scroll" x="105" y="30" height="14" width="14.0" class="combo tap glyph scroll"/>
 </g>
@@ -1362,14 +1374,20 @@ path.combo {
 </a><text x="336" y="223" class="combo hold">toggle</text>
 </g>
 <g class="combo combopos-6">
+<path d="M250,291 h23 a6.0,6.0 0 0 0 6.0,-6.0 v-22" class="combo"/>
+<path d="M250,291 h-23 a6.0,6.0 0 0 1 -6.0,-6.0 v-46" class="combo"/>
+<rect rx="6" ry="6" x="234" y="275" width="32" height="32" class="combo"/>
+<text x="250" y="291" class="combo tap">NAV</text>
+</g>
+<g class="combo combopos-7">
 <rect rx="6" ry="6" x="152" y="20" width="32" height="32" class="combo"/>
 <use href="#material:left_click" xlink:href="#material:left_click" x="161" y="29" height="14" width="14.0" class="combo tap glyph material:left_click"/>
 </g>
-<g class="combo combopos-7">
+<g class="combo combopos-8">
 <rect rx="6" ry="6" x="40" y="40" width="32" height="32" class="combo"/>
 <use href="#material:right_click" xlink:href="#material:right_click" x="49" y="49" height="14" width="14.0" class="combo tap glyph material:right_click"/>
 </g>
-<g class="combo combopos-8">
+<g class="combo combopos-9">
 <rect rx="6" ry="6" x="96" y="21" width="32" height="32" class="combo"/>
 <use href="#scroll" xlink:href="#scroll" x="105" y="30" height="14" width="14.0" class="combo tap glyph scroll"/>
 </g>
@@ -1796,9 +1814,15 @@ path.combo {
 <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 class="combo combopos-0">
+<path d="M250,291 h23 a6.0,6.0 0 0 0 6.0,-6.0 v-22" class="combo"/>
+<path d="M250,291 h-23 a6.0,6.0 0 0 1 -6.0,-6.0 v-46" class="combo"/>
+<rect rx="6" ry="6" x="234" y="275" width="32" height="32" class="combo"/>
+<text x="250" y="291" class="combo tap">NAV</text>
+</g>
 </g>
 </g>
-<g transform="translate(30, 2783)" class="layer-Numbers">
+<g transform="translate(30, 2807)" class="layer-Numbers">
 <text x="0" y="28" class="label" id="Numbers">Numbers</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 81)" class="key keypos-0">
@@ -1942,7 +1966,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 3121)" class="layer-Mouse">
+<g transform="translate(30, 3145)" class="layer-Mouse">
 <text x="0" y="28" class="label" id="Mouse">Mouse</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 81)" class="key keypos-0">
@@ -2073,7 +2097,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 3460)" class="layer-Game">
+<g transform="translate(30, 3484)" class="layer-Game">
 <text x="0" y="28" class="label" id="Game">Game</text>
 <g transform="translate(0, 56)">
 <g transform="translate(28, 81)" class="key keypos-0">
@@ -2214,8 +2238,8 @@ path.combo {
 </g>
 </g>
 </g>
-<text x="30" y="3827" class="label" id="Combos">Combos</text>
-<g transform="translate(30, 3799)" class="layer-combopos-0">
+<text x="30" y="3851" class="label" id="Combos">Combos</text>
+<g transform="translate(30, 3823)" 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"/>
@@ -2327,7 +2351,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(396, 3799)" class="layer-combopos-1">
+<g transform="translate(396, 3823)" 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"/>
@@ -2439,7 +2463,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 4055)" class="layer-combopos-2">
+<g transform="translate(30, 4079)" 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"/>
@@ -2549,7 +2573,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(396, 4055)" class="layer-combopos-3">
+<g transform="translate(396, 4079)" 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"/>
@@ -2661,7 +2685,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 4284)" class="layer-combopos-4">
+<g transform="translate(30, 4308)" 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"/>
@@ -2774,7 +2798,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(396, 4284)" class="layer-combopos-5">
+<g transform="translate(396, 4308)" 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"/>
@@ -2886,7 +2910,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 4512)" class="layer-combopos-6">
+<g transform="translate(30, 4536)" 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"/>
@@ -2998,7 +3022,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(396, 4512)" class="layer-combopos-7">
+<g transform="translate(396, 4536)" class="layer-combopos-7">
 <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"/>
@@ -3110,7 +3134,7 @@ path.combo {
 </g>
 </g>
 </g>
-<g transform="translate(30, 4741)" class="layer-combopos-8">
+<g transform="translate(30, 4765)" class="layer-combopos-8">
 <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/config.yaml b/keymap-drawer/config.yaml
index 9f0ea76..99f3f60 100644
--- a/keymap-drawer/config.yaml
+++ b/keymap-drawer/config.yaml
@@ -508,7 +508,8 @@ parse_config:
     "&out OUT_TOG": '$$output-toggle$$',
     "&kp SAPOS": "'",
     "&kp DAPOS": '"',
-    "&soft_off": "$$mdi:power-standby$$"
+    "&soft_off": "$$mdi:power-standby$$",
+    "&tog NAV": "NAV"
     }
   sticky_label: sticky
   toggle_label: toggle
@@ -712,6 +713,12 @@ parse_config:
     combo_tab_34:
       align: "bottom"
       offset: 0.3
+    combo_nav_toggle:
+      align: "bottom"
+      offset: 0.3
+    combo_nav_toggle_34:
+      align: "bottom"
+      offset: 0.3
     combo_rightclick:
       align: "top"
       offset: -0.7
diff --git a/keymap-drawer/urchin_keymap.yaml b/keymap-drawer/urchin_keymap.yaml
index 0fe5b3f..e4901bb 100644
--- a/keymap-drawer/urchin_keymap.yaml
+++ b/keymap-drawer/urchin_keymap.yaml
@@ -401,6 +401,11 @@ combos:
   l: [QWERTY]
   a: top
   o: 0.1
+- p: [31, 30]
+  k: NAV
+  l: [QWERTY, Colemak, Ergo-L, Navigation]
+  a: bottom
+  o: 0.3
 - p: [3, 2]
   k: $$material:left_click$$
   l: [QWERTY, Colemak, Ergo-L]