Skip to content

Commit

Permalink
fix: remove multi-layer, normalize
Browse files Browse the repository at this point in the history
  • Loading branch information
@minusfive
minusfive committed Oct 8, 2024
1 parent f367c05 commit 9780a3b
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 32 deletions.
2 changes: 1 addition & 1 deletion config/corne.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@

// Other layers
#include "../knucklehead/L2.dtsi"
#include "../knucklehead/L3.dtsi"
#include "../knucklehead/Fn.dtsi"
4 changes: 2 additions & 2 deletions config/corneish_zen.keymap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
// Alpha layer: uncomment desired, comment the others
#include "../knucklehead/L1_colemak-dh.dtsi"
// #include "../knucklehead/L1_colemak.dtsi"
#include "../knucklehead/L1_qwerty.dtsi"
// #include "../knucklehead/L1_qwerty.dtsi"

// Other layers
#include "../knucklehead/L2.dtsi"
#include "../knucklehead/L3.dtsi"
#include "../knucklehead/Fn.dtsi"

/ {
chosen {
Expand Down
2 changes: 1 addition & 1 deletion knucklehead/L3.dtsi → knucklehead/Fn.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// │0 │1 │2 │3 │4 │5 │ │6 │7 │8 │9 │10 │11 │
&out OUT_TOG &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &trans &tog QWERTY &trans &trans &trans &kp C_POWER
&out OUT_TOG &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &trans &trans &trans &trans &trans &kp C_POWER
// ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤ ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤
// │12 │13 │14 │15 │16 │17 │ │18 │19 │20 │21 │22 │23 │
&sys_reset &kp F6 &hrml LCTRL F7 &hrml LALT F8 &hrml LCMD F9 &hrml MEH F10 &trans &trans &trans &trans &trans &sys_reset
Expand Down
2 changes: 1 addition & 1 deletion knucklehead/L1_colemak-dh.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
compatible = "zmk,keymap";

colemak_dh {
display-name = "CLMK-DH";
display-name = "L1";
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// │0 │1 │2 │3 │4 │5 │ │6 │7 │8 │9 │10 │11 │
Expand Down
6 changes: 3 additions & 3 deletions knucklehead/L1_colemak.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
keymap {
compatible = "zmk,keymap";

layer_1 {
colemak {
display-name = "L1";
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// │0 │1 │2 │3 │4 │5 │ │6 │7 │8 │9 │10 │11 │
&kp ESC &kp Q &kp W &kp F &kp P &kp G &kp J &kp L &kp U &kp Y &kp SQT &kp K_CANCEL
// ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤ ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤
// │12 │13 │14 │15 │16 │17 │ │18 │19 │20 │21 │22 │23 │
&bkspc_del &kp A &kp R &kp S &kp T &kp D &kp H &kp N &kp E &kp I &kp O &kp ENTER
&bkspc_del &kp A &hrml LCTRL R &hrml LALT S &hrml LCMD T &hrml MEH D &hrmr MEH H &hrmr LCMD N &hrmr LALT E &hrmr LCTRL I &kp O &kp ENTER
// ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤ ├───────────────├───────────────┼───────────────┼───────────────┼───────────────┼───────────────┤
// │24 │25 │26 │27 │28 │29 │ │30 │31 │32 │33 │34 │35 │
&csl Fn &mt LCTRL Z &mt LALT X &mt LCMD C &mt MEH V &kp B &kp K &mt MEH M &mt RCMD COMMA &mt RALT DOT &mt RCTRL SLASH &csl Fn
&csl Fn &kp Z &kp X &kp C &kp V &kp B &kp K &kp M &kp COMMA &kp DOT &kp SLASH &csl Fn
// ╰───────────────┴───────────────┴───────────────┼───────────────┼───────────────┼───────────────┤ ├───────────────├───────────────┼───────────────┼───────────────┴───────────────┴───────────────╯
// │36 │37 │38 │ │39 │40 │41 │
&kp TAB &mt LSHFT SPACE &smart_num L2 0 &smart_num L2 0 &smart_shift &kp GRAVE
Expand Down
2 changes: 1 addition & 1 deletion knucklehead/L1_qwerty.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
compatible = "zmk,keymap";

qwerty {
display-name = "QWERTY";
display-name = "L1";
bindings = <
// ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮ ╭───────────────┬───────────────┬───────────────┬───────────────┬───────────────┬───────────────╮
// │0 │1 │2 │3 │4 │5 │ │6 │7 │8 │9 │10 │11 │
Expand Down
5 changes: 2 additions & 3 deletions knucklehead/base.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

// Layers
#define L1 0
#define QWERTY 1
#define L2 2
#define Fn 3
#define L2 1
#define Fn 2

// Meh key
#define MEH LS(LC(LALT))
Expand Down
40 changes: 20 additions & 20 deletions knucklehead/combos.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@
*/

/* Layers */
// COMBO(to_2, &to L2, 38 39, L1 QWERTY, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
// COMBO(to_2, &to L2, 38 39, L1, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)

/* Symbols */
// Left
COMBO(excl, &kp EXCL, 1 13, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(at, &kp AT, 2 14, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(hash, &kp HASH, 3 15, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(dollar, &kp DOLLAR, 4 16, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(percent, &kp PERCENT, 5 17, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(caret, &kp CARET, 13 25, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(ampersand, &kp AMPERSAND, 14 26, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(star, &kp STAR, 15 27, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(lpar, &kp LPAR, 16 28, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(rpar, &kp RPAR, 17 29, L1 QWERTY L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(excl, &kp EXCL, 1 13, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(at, &kp AT, 2 14, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(hash, &kp HASH, 3 15, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(dollar, &kp DOLLAR, 4 16, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(percent, &kp PERCENT, 5 17, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(caret, &kp CARET, 13 25, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(ampersand, &kp AMPERSAND, 14 26, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(star, &kp STAR, 15 27, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(lpar, &kp LPAR, 16 28, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(rpar, &kp RPAR, 17 29, L1 L2, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
// Right
COMBO(minus, &kp MINUS, 7 19, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(equal, &kp EQUAL, 8 20, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(semicolon, &kp SEMICOLON, 9 21, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(pgup, &kp PG_UP, 6 18, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(pgdn, &kp PG_DN, 18 30, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(lbkt, &kp LBKT, 19 31, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(rbkt, &kp RBKT, 20 32, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(backslash, &kp BACKSLASH, 21 33, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(minus, &kp MINUS, 7 19, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(equal, &kp EQUAL, 8 20, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(semicolon, &kp SEMICOLON, 9 21, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(pgup, &kp PG_UP, 6 18, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(pgdn, &kp PG_DN, 18 30, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(lbkt, &kp LBKT, 19 31, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(rbkt, &kp RBKT, 20 32, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(backslash, &kp BACKSLASH, 21 33, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)

/* Bluetooth */
COMBO(bt_clear, &bt BT_CLR, 1 2 3 4, Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
Expand All @@ -55,6 +55,6 @@
COMBO(bt_sel_4, &bt BT_SEL 4, 5 17, Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)

/* Media */
COMBO(play, &kp C_PP, 6 7, L1 QWERTY L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
COMBO(play, &kp C_PP, 6 7, L1 L2 Fn, COMBO_TERM_DEFAULT, COMBO_QUICK_TAP_MS)
};
};

0 comments on commit 9780a3b

Please sign in to comment.