From 0d0dccd75324a5cfee9ab35648395c21f62d463d Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 30 Sep 2023 12:21:52 +0100
Subject: [PATCH] keymap-drawer: more mapping fixes

---
 config/glove80.keymap     |  2 +-
 config/keymap_drawer.yaml | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/config/glove80.keymap b/config/glove80.keymap
index ea67131..e3ee7df 100644
--- a/config/glove80.keymap
+++ b/config/glove80.keymap
@@ -194,7 +194,7 @@
 &kp F11        &kp N1      &kp N2  &kp N3  &kp N4  &kp N5                                                                                                             &kp N6  &kp N7  &kp N8       &kp N9      &kp N0          &kp F12
 &none          &kp Q       &kp W   &kp F   &kp P   &kp B                                                                                                              &kp J   &kp L   &kp U        &kp Y       &quotes         &none
 &under_backsl  &kp A       &kp R   &kp S   &kp T   &kp G                                                                                                              &kp M   &kp N   &kp E        &kp I       &kp O           &dash_slash
-&none          &kp Z       &kp X   &kp C   &kp D   &kp V   &smart_lshift  &nav          &kp LEFT_GUI              &kp LEFT_ALT           &nav          &smart_rshift  &kp K   &kp H   &comma_semi  &dot_colon  &question_excl  &none
+&none          &kp Z       &kp X   &kp C   &kp D   &kp V   &smart_lshift  &nav          &kp LEFT_META             &kp LEFT_ALT           &nav          &smart_rshift  &kp K   &kp H   &comma_semi  &dot_colon  &question_excl  &none
 &tog 4         &magic 5 0  &none   &none   &none           &kp BSPC       &lt 2 ESCAPE  &mt LEFT_CONTROL LS(TAB)  &mt RIGHT_CONTROL TAB  &lt 2 RETURN  &kp SPACE              &none   &none        &none       &kp RALT        &tog 1
             >;
         };
diff --git a/config/keymap_drawer.yaml b/config/keymap_drawer.yaml
index 67149d8..090d062 100644
--- a/config/keymap_drawer.yaml
+++ b/config/keymap_drawer.yaml
@@ -106,6 +106,7 @@ parse_config:
 
   raw_binding_map:
     # Custom behavior
+    '&caps_word': $$mdi:apple-keyboard-caps$$
     '&smart_lshift': $$mdi:apple-keyboard-shift$$
     '&smart_rshift': $$mdi:apple-keyboard-shift$$
     '&symbols': $$mdi:symbol$$
@@ -146,9 +147,6 @@ parse_config:
     '&sys_reset': 'Reset'
 
   zmk_keycode_map:
-    '&caps_word': $$mdi:apple-keyboard-caps$$
-    Symbols: $$mdi:symbol$$
-
     RET:
       type: enter
       tap: $$mdi:keyboard-return$$
@@ -159,6 +157,7 @@ parse_config:
       type: enter
       tap: $$mdi:keyboard-return$$
     ESC: $$mdi:keyboard-esc$$
+    ESCAPE: $$mdi:keyboard-esc$$
     TAB: $$mdi:keyboard-tab$$
     LS(TAB): $$mdi:keyboard-tab-reverse$$
     SPACE: $$mdi:keyboard-space$$
@@ -180,8 +179,15 @@ parse_config:
     RCTRL: 'Ctrl'
     RIGHT_CONTROL: 'Ctrl'
     LSHFT: $$mdi:apple-keyboard-shift$$
+    LSHIFT: $$mdi:apple-keyboard-shift$$
+    LEFT_SHIFT: $$mdi:apple-keyboard-shift$$
     RSHFT: $$mdi:apple-keyboard-shift$$
+    RSHIFT: $$mdi:apple-keyboard-shift$$
+    RIGHT_SHIFT: $$mdi:apple-keyboard-shift$$
     LGUI: $$mdi:monitor-dashboard$$
+    LEFT_GUI: $$mdi:monitor-dashboard$$
+    LMETA: $$mdi:monitor-dashboard$$
+    LEFT_META: $$mdi:monitor-dashboard$$
     
     EXCLAMATION: '!'
     EXCL: '!'