From 15cd2bb40f979ab44f4f74061456410fbd97ce16 Mon Sep 17 00:00:00 2001
From: ctranstrum <ctranstrum@users.noreply.github.com>
Date: Thu, 6 Jun 2024 17:27:20 -0700
Subject: [PATCH] allow access to dedicated modifier keys even on (most) layers

---
 config/ergonaut_one.keymap      | 16 ++++++++--------
 keymap-drawer/ergonaut_one.svg  |  7 +++++++
 keymap-drawer/ergonaut_one.yaml | 14 +++++++-------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/config/ergonaut_one.keymap b/config/ergonaut_one.keymap
index 0831c9d..09b9984 100644
--- a/config/ergonaut_one.keymap
+++ b/config/ergonaut_one.keymap
@@ -272,8 +272,8 @@
 // ┃  ctrl ┃ cmd z ┃ cmd x ┃ cmd c ┃ cmd d ┃ cmd v ┃            ┃   :   ┃   1   ┃   2   ┃   3   ┃   =   ┃  TAB  ┃
    &kp LCTRL CMD(Z)  CMD(X)  CMD(C)  CMD(D)  CMD(V)             &kp COLON &kp N1 &kp N2 &kp N3  &kp EQUAL &kp TAB
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━┳━━━┻━━━┳━━━┻━━━┳━━━┻━━━┓    ┏━━━┻━━━┳━━━┻━━━┳━━━┻━━━┳━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
-//                             ┃  opt  ┃  ###  ┃ SHIFT ┃    ┃   ,   ┃   0   ┃   .   ┃
-                               &kp LALT  I___I   I___I      &kp COMMA &kp N0 &kp DOT
+//                             ┃  opt  ┃  ###  ┃ SHIFT ┃    ┃   ,   ┃ 0 cmd ┃ . alt ┃
+                               &kp LALT  I___I   I___I &kp COMMA &mt LCMD N0 &mt RALT DOT
 //                             ┗━━━━━━━┻━━━━━━━┫  nav  ┃    ┃       ┣━━━━━━━┻━━━━━━━┛
 //                                             ┗━━━━━━━┛    ┗━━━━━━━┛
             >;
@@ -294,8 +294,8 @@
 // ┃  ctrl ┃ cmd z ┃ cmd x ┃ cmd c ┃ cmd d ┃ cmd v ┃            ┃ Pg Dn ┃       ┃   ↓   ┃       ┃       ┃ shift ┃
    &kp LCTRL CMD(Z)  CMD(X)  CMD(C)  CMD(D)  CMD(V)             &kp PG_DN  ___   &kp DOWN  ___     ___  &kp LSHFT
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━┳━━━┻━━━┳━━━┻━━━┳━━━┻━━━┓    ┏━━━┻━━━┳━━━┻━━━┳━━━┻━━━┳━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
-//                             ┃  opt  ┃  num  ┃  ###  ┃    ┃ SPACE ┃ HOME  ┃  END  ┃
-                               &kp LALT  I___I   I___I       &kp SPC &kp HOME &kp END
+//                             ┃  opt  ┃  num  ┃  ###  ┃    ┃ SPACE ┃HOMEcmd┃END alt┃
+                               &kp LALT  I___I   I___I &kp SPC &mt LCMD HOME &mt RALT END
 //                             ┗━━━━━━━┻━━━━━━━┫       ┃    ┃       ┣━━━━━━━┻━━━━━━━┛
 //                                             ┗━━━━━━━┛    ┗━━━━━━━┛
             >;
@@ -316,8 +316,8 @@
 // ┃  ctrl ┃       ┃       ┃       ┃       ┃       ┃            ┃       ┃  F1   ┃  F2   ┃  F3   ┃  F10  ┃ shift ┃
    &kp LCTRL  ___     ___     ___     ___     ___                  ___   &kp F1  &kp F2  &kp F3  &kp F10 &kp LSHFT
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━┳━━━┻━━━┳━━━┻━━━┳━━━┻━━━┓    ┏━━━┻━━━┳━━━┻━━━┳━━━┻━━━┳━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
-//                             ┃  opt  ┃  ###  ┃  ###  ┃    ┃  F10  ┃  F11  ┃  F12  ┃
-                               &kp LALT  I___I   I___I       &kp F10 &kp F11 &kp F12
+//                             ┃  opt  ┃  ###  ┃  ###  ┃    ┃  F10  ┃F11 cmd┃F12 alt┃
+                               &kp LALT  I___I   I___I  &kp F10 &mt LCMD F11 &mt RALT F12
 //                             ┗━━━━━━━┻━━━━━━━┫       ┃    ┃       ┣━━━━━━━┻━━━━━━━┛
 //                                             ┗━━━━━━━┛    ┗━━━━━━━┛
             >;
@@ -335,8 +335,8 @@
 // ┃   ^   ┃   @   ┃   -   ┃   !   ┃   =   ┃   $   ┃            ┃  alt  ┃  cmd  ┃  opt  ┃  ctrl ┃       ┃       ┃
 &kp CARET &kp AT &kp MINUS &kp EXCL &kp EQUAL &kp DLLR          &kp RALT &kp LCMD &kp LALT &kp LCTRL ___   ___
 // ┣━━━━━━━╋━━━━━━━╋━━━━━━━╋━━━━━━━╋━━━━━━━╋━━━━━━━┫            ┣━━━━━━━╋━━━━━━━╋━━━━━━━╋━━━━━━━╋━━━━━━━╋━━━━━━━┫
-// ┃   ~   ┃   <   ┃   >   ┃   +   ┃   _   ┃   ?   ┃            ┃       ┃       ┃       ┃       ┃       ┃       ┃
- &kp TILDE &kp LT &kp GT &kp PLUS &kp UNDER &kp QMARK              ___     ___     ___     ___     ___     ___
+// ┃ ~ ctrl┃   <   ┃   >   ┃   +   ┃   _   ┃   ?   ┃            ┃       ┃       ┃       ┃       ┃       ┃       ┃
+&mt LCTRL TILDE &kp LT &kp GT &kp PLUS &kp UNDER &kp QMARK         ___     ___     ___     ___     ___     ___
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┻━━━┳━━━┻━━━┳━━━┻━━━┳━━━┻━━━┓    ┏━━━┻━━━┳━━━┻━━━┳━━━┻━━━┳━━━┻━━━━━━━┻━━━━━━━┻━━━━━━━┛
 //                             ┃  =>   ┃   |   ┃   &   ┃    ┃  ###  ┃       ┃  alt  ┃
                               &arrow_fn &kp PIPE &kp AMPS     I___I    ___   &kp RALT
diff --git a/keymap-drawer/ergonaut_one.svg b/keymap-drawer/ergonaut_one.svg
index f48597d..bc2906f 100644
--- a/keymap-drawer/ergonaut_one.svg
+++ b/keymap-drawer/ergonaut_one.svg
@@ -837,10 +837,12 @@ path.combo { stroke: #7f7f7f; }
 <g transform="translate(554, 213) rotate(-15.0)" class="key keypos-40">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">0</text>
+<text x="0" y="24" class="key hold">⌘</text>
 </g>
 <g transform="translate(616, 205)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">.</text>
+<text x="0" y="24" class="key hold">alt</text>
 </g>
 </g>
 </g>
@@ -1007,10 +1009,12 @@ path.combo { stroke: #7f7f7f; }
 <g transform="translate(554, 213) rotate(-15.0)" class="key keypos-40">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">home</text>
+<text x="0" y="24" class="key hold">⌘</text>
 </g>
 <g transform="translate(616, 205)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">end</text>
+<text x="0" y="24" class="key hold">alt</text>
 </g>
 </g>
 </g>
@@ -1161,10 +1165,12 @@ path.combo { stroke: #7f7f7f; }
 <g transform="translate(554, 213) rotate(-15.0)" class="key keypos-40">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">F11</text>
+<text x="0" y="24" class="key hold">⌘</text>
 </g>
 <g transform="translate(616, 205)" class="key keypos-41">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">F12</text>
+<text x="0" y="24" class="key hold">alt</text>
 </g>
 </g>
 </g>
@@ -1262,6 +1268,7 @@ path.combo { stroke: #7f7f7f; }
 <g transform="translate(28, 161)" class="key keypos-24">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
 <text x="0" y="0" class="key tap">~</text>
+<text x="0" y="24" class="key hold">ctrl</text>
 </g>
 <g transform="translate(84, 161)" class="key keypos-25">
 <rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
diff --git a/keymap-drawer/ergonaut_one.yaml b/keymap-drawer/ergonaut_one.yaml
index eadcf75..f79b4f6 100644
--- a/keymap-drawer/ergonaut_one.yaml
+++ b/keymap-drawer/ergonaut_one.yaml
@@ -169,8 +169,8 @@ layers:
   - {type: held}
   - {t: ▽, type: trans}
   - ','
-  - '0'
-  - .
+  - {t: '0', h: ⌘}
+  - {t: ., h: alt}
   navigation:
   - ''
   - ''
@@ -212,8 +212,8 @@ layers:
   - {t: ▽, type: trans}
   - {type: held}
   - ␣
-  - home
-  - end
+  - {t: home, h: ⌘}
+  - {t: end, h: alt}
   function:
   - ''
   - ''
@@ -255,8 +255,8 @@ layers:
   - {type: held}
   - {type: held}
   - F10
-  - F11
-  - F12
+  - {t: F11, h: ⌘}
+  - {t: F12, h: alt}
   symbols:
   - '`'
   - /
@@ -282,7 +282,7 @@ layers:
   - ctrl
   - ''
   - ''
-  - '~'
+  - {t: '~', h: ctrl}
   - <
   - '>'
   - +