Remove reserved layer — may interfere with layer indexing

config/corne.keymap

@@ -88,13 +88,10 @@
             bindings = <
 &bt BT_CLR      &bt BT_SEL 0        &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3    &bt BT_SEL 4    &kp PLUS  &kp LBKT    &kp UP      &kp RBKT      &kp ASTRK     &kp EQUAL
 &out OUT_TOG    &none               &none           &none           &none           &none           &kp MINUS &kp LEFT    &kp DOWN    &kp RIGHT     &kp FSLH      &kp BSLH
-&kp LSHFT       &kp Z               &kp X           &kp C           &kp V           &none           &to 0     &to 1       &to 2       &to 3         &to 5         &kp RSHFT
+&kp LSHFT       &kp Z               &kp X           &kp C           &kp V           &none           &to 0     &to 1       &to 2       &to 3         &none         &kp RSHFT
                                                     &kp ESC         &kp LCTRL       &kp LGUI        &kp SPACE &kp RALT    &none
             >;
         };
 
-        extra_1 {
-            status = "reserved";
-        };
     };
 };

keymap-drawer/corne.yaml

@@ -1,7 +1,50 @@
 layout: {zmk_keyboard: corne}
 layers:
-  BAS:
+  CARP:
+  - '`'
+  - Q
+  - G
+  - M
+  - L
+  - W
+  - Y
+  - F
+  - U
+  - B
+  - ;
+  - {t: HUB, h: toggle}
+  - ↹
+  - D
+  - S
+  - T
+  - N
+  - R
+  - I
+  - A
+  - E
+  - O
+  - H
+  - ''''
+  - $$mdi:apple-keyboard-shift$$
+  - Z
+  - X
+  - C
+  - V
+  - J
+  - K
+  - P
+  - ','
+  - .
+  - /
+  - $$mdi:apple-keyboard-shift$$
   - Esc
+  - $$mdi:apple-keyboard-control$$
+  - $$mdi:apple-keyboard-command$$
+  - ␣
+  - $$mdi:apple-keyboard-option$$
+  - HUB
+  QWRT:
+  - '`'
   - Q
   - W
   - E
@@ -12,20 +55,20 @@ layers:
   - I
   - O
   - P
-  - ⌦
+  - {t: HUB, h: toggle}
-  - {t: ↹, h: '$$mdi:apple-keyboard-shift$$'}
+  - ↹
   - A
   - S
   - D
-  - {t: F, h: RAI}
+  - F
   - G
   - H
   - J
   - K
   - L
   - ;
-  - {t: '''', h: '$$mdi:apple-keyboard-shift$$'}
+  - ''''
-  - $$mdi:apple-keyboard-option$$
+  - $$mdi:apple-keyboard-shift$$
   - Z
   - X
   - C
@@ -36,96 +79,179 @@ layers:
   - ','
   - .
   - /
-  - \
+  - $$mdi:apple-keyboard-shift$$
-  - LWIN
+  - Esc
-  - {t: ↹, h: '$$mdi:apple-keyboard-control$$'}
+  - $$mdi:apple-keyboard-control$$
-  - {t: ⏎, h: LOW}
+  - $$mdi:apple-keyboard-command$$
-  - {t: ␣, h: RAI}
+  - ␣
-  - {t: '$$mdi:backspace-outline$$', h: '$$mdi:apple-keyboard-control$$'}
+  - $$mdi:apple-keyboard-option$$
-  - RWIN
+  - HUB
-  LOW:
+  STEN:
-  - '&studio_unlock'
+  - ''
+  - '1'
+  - '2'
+  - '3'
+  - '4'
+  - '5'
+  - '6'
+  - '7'
+  - '8'
+  - '9'
+  - '0'
+  - {t: HUB, h: toggle}
+  - ''
+  - Q
+  - W
+  - E
+  - R
+  - T
+  - Y
+  - U
+  - I
+  - O
+  - P
+  - '['
+  - ''
+  - A
+  - S
+  - D
+  - F
+  - G
+  - H
+  - J
+  - K
+  - L
+  - ;
+  - ''''
+  - ''
+  - C
+  - V
+  - N
+  - M
+  - ''
+  FPS:
+  - {t: '1', h: Esc}
+  - '2'
+  - Q
+  - W
+  - {t: E, h: '3'}
+  - {t: R, h: '4'}
+  - '5'
+  - '6'
+  - '7'
+  - '8'
+  - '9'
+  - {t: HUB, h: toggle}
+  - ↹
+  - $$mdi:apple-keyboard-shift$$
+  - A
+  - S
+  - D
+  - G
+  - ''
+  - ''
+  - ''
+  - ''
+  - ''
+  - ''
+  - M
+  - Z
+  - X
+  - C
+  - V
+  - F
+  - ''
+  - ''
+  - ''
+  - ''
+  - ''
+  - ''
+  - {t: T, h: '$$mdi:apple-keyboard-option$$'}
+  - $$mdi:apple-keyboard-control$$
+  - ␣
+  - ''
+  - ''
+  - HUB
+  HUB:
   - BT CLR
   - BT 1
   - BT 2
   - BT 3
   - BT 4
-  - {t: ▽, type: trans}
+  - BT 5
-  - Home
+  - +
+  - '['
   - ↑
-  - End
+  - ']'
-  - Sft+[
+  - '*'
-  - {t: ▽, type: trans}
+  - '='
-  - Reset
+  - OUT TOG
-  - $$mdi:apple-keyboard-control$$
+  - ''
-  - $$mdi:apple-keyboard-shift$$
+  - ''
-  - $$mdi:apple-keyboard-option$$
+  - ''
-  - $$mdi:apple-keyboard-command$$
+  - ''
-  - {t: ▽, type: trans}
+  - ''
-  - {t: ▽, type: trans}
+  - '-'
   - ←
   - ↓
   - →
-  - Sft+]
+  - /
-  - {t: ▽, type: trans}
+  - \
-  - {t: ▽, type: trans}
+  - $$mdi:apple-keyboard-shift$$
-  - {t: '$$mdi:led-on$$', h: '$$mdi:toggle-switch$$', s: '$$mdi:led-outline$$', type: toggle}
+  - Z
-  - {t: '$$mdi:led-on$$', h: '$$mdi:page-previous-outline$$', type: tap_dance}
+  - X
-  - {t: '$$mdi:led-on$$', s: '$$tabler:brightness-up$$', type: sym_by_sym}
+  - C
-  - {t: '$$mdi:led-outline$$', s: '$$tabler:brightness-down$$', type: sym_by_sym}
+  - V
-  - {t: ▽, type: trans}
+  - ''
-  - {t: ▽, type: trans}
+  - {t: CARP, h: toggle}
-  - (
+  - {t: QWRT, h: toggle}
-  - )
+  - {t: STEN, h: toggle}
-  - '['
+  - {t: FPS, h: toggle}
-  - ']'
+  - ''
-  - {t: ▽, type: trans}
+  - $$mdi:apple-keyboard-shift$$
-  - {t: ▽, type: trans}
+  - Esc
-  - {t: ▽, type: trans}
+  - $$mdi:apple-keyboard-control$$
+  - $$mdi:apple-keyboard-command$$
+  - ␣
+  - $$mdi:apple-keyboard-option$$
   - {type: held}
-  - {t: ▽, type: trans}
+combos:
-  - {t: ▽, type: trans}
+- p: [1, 13]
-  - {t: ▽, type: trans}
+  k: '1'
-  RAI:
+  l: [CARP, QWRT]
-  - {t: ▽, type: trans}
+- p: [2, 14]
-  - '`'
+  k: '2'
-  - '%'
+  l: [CARP, QWRT]
-  - '|'
+- p: [3, 15]
-  - AMPS
+  k: '3'
-  - '='
+  l: [CARP, QWRT]
-  - {t: ▽, type: trans}
+- p: [4, 16]
-  - '7'
+  k: '4'
-  - '8'
+  l: [CARP, QWRT]
-  - '9'
+- p: [5, 17]
-  - F1
+  k: '5'
-  - F2
+  l: [CARP, QWRT]
-  - {t: ▽, type: trans}
+- p: [6, 18]
-  - '!'
+  k: '6'
-  - '@'
+  l: [CARP, QWRT]
-  - '#'
+- p: [7, 19]
-  - {t: $, type: held}
+  k: '7'
-  - Sft+.
+  l: [CARP, QWRT]
-  - {t: ▽, type: trans}
+- p: [8, 20]
-  - '4'
+  k: '8'
-  - '5'
+  l: [CARP, QWRT]
-  - '6'
+- p: [9, 21]
-  - F3
+  k: '9'
-  - F4
+  l: [CARP, QWRT]
-  - {t: ▽, type: trans}
+- p: [10, 22]
-  - ^
+  k: '0'
-  - '*'
+  l: [CARP, QWRT]
-  - Sft+-
+- p: [20, 21]
-  - Sft+=
+  k: $$mdi:backspace-outline$$
-  - '-'
+  l: [CARP, QWRT]
-  - {t: ▽, type: trans}
+- p: [19, 20]
-  - '1'
+  k: ⏎
-  - '2'
+  l: [CARP, QWRT]
-  - '3'
+- p: [39, 40]
-  - F5
+  k: ⏎
-  - F6
+  l: [CARP, HUB, QWRT, FPS]
-  - {t: ▽, type: trans}
-  - {t: ▽, type: trans}
-  - {t: ▽, type: trans}
-  - ⏎
-  - '0'
-  - {t: ▽, type: trans}