From 63a83d81a5b1376c5222353e4ad19b76b38418b3 Mon Sep 17 00:00:00 2001 From: Basim Ali Yoshiguchi Date: Tue, 14 May 2024 07:44:35 +0200 Subject: [PATCH 01/23] first conversion to zmk-helper --- .gitmodules | 3 + config/corne.keymap | 334 +++++++++++++++++++++----------------------- zmk-helpers | 1 + 3 files changed, 162 insertions(+), 176 deletions(-) create mode 100644 .gitmodules create mode 160000 zmk-helpers diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..07fc0de --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "zmk-helpers"] + path = zmk-helpers + url = https://github.com/urob/zmk-helpers.git diff --git a/config/corne.keymap b/config/corne.keymap index 81ddfe9..bddfa2c 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -7,185 +7,167 @@ #include #include #include +#include "../zmk-nodefree-config/helper.h" - -#define DEFAULT 0 -#define LOWER 1 -#define RAISE 2 +#define DEF 0 +#define NUM 1 +#define CHARS 2 #define NAVI 3 #define ADJS 4 #define FUNC 5 #define WIN 6 -&mt { - tapping-term-ms = <400>; -}; - -/ { - behaviors { - hm: homerow_mods { - compatible = "zmk,behavior-hold-tap"; - label = "HOMEROW_MODS"; - #binding-cells = <2>; - tapping-term-ms = <400>; - quick-tap-ms = <0>; - flavor = "tap-preferred"; - bindings = - <&kp>, - <&kp>; - }; - }; - - combos { - compatible = "zmk,combos"; - - - }; - - keymap { - compatible = "zmk,keymap"; - - default_layer { - // DEFAULT LAYER - // .--------------------------------------------------------------. .-----------------------------------------------------------. - // | ESC | Q | W | E/NAV | R/WIN | T | | Y | U | I | O | P | BKSP | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | CTRL/Tab | A | S | D | F | G | | H | J | K | L | Ö | Ä | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | SHFT | Z | X | C | V | B/FUNC | | N | M | . | , | Å | NAV | - // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' - // | GUI | RSE | SPC | | ENT | LWR | LALT | - // '--------+---------+---------' '-------+---------+---------' - display-name = "Main"; - bindings = < - &kp ESC &kp Q &kp W < 3 E < 6 R &kp T &kp Y &kp U &kp I &kp O &kp P &kp DEL - &mt LCTRL TAB &kp A &hm LALT S &hm LSHIFT D &hm LCTRL F &kp G &kp H &hm RCTRL J &hm RSHIFT K &hm RALT L &kp SEMI &kp LBKT - &kp LSHIFT &kp Z &kp X &kp C &kp V < 5 B &kp N &kp M &kp DOT &kp COMMA &trans &kp SQT - &kp LGUI &mo 1 &kp SPACE &mt 4 RET &mo 2 &kp BSPC - >; - }; - - lower_layer { - // LOWER Layer: Media and Number Pad - // .--------------------------------------------------------------. .-----------------------------------------------------------. - // | ESC | | | | | Numlock | | / ? | 7 & | 8 * | 9 ( | - _ | BKSP | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | CTRL/Tab | | | | | | | * | 4 $ | 5 % | 6 ^ | , < | | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | SHIFT | | | | | | | | 1 ! | 2 @ | 3 # | = + | | - // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' - // | | | | | | | 0 ) | - // '--------+---------+---------' '-------+---------+---------' - display-name = "Numbers"; - bindings = < - &kp ESC &trans &trans &trans &trans &kp KP_NUMLOCK &kp FSLH &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp MINUS &kp BSPC - &mt LCTRL TAB &trans &trans &trans &trans &trans &kp STAR &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp COMMA &trans - &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp EQUAL &trans - &trans &trans &kp TAB &trans &mo 4 &kp NUMBER_0 - >; - }; - - raise_layer { - // RAISE Layer: Special Chars - // .--------------------------------------------------------------. .-----------------------------------------------------------. - // | & | * | @ | { | } | | | | + | - | | | | DEL | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | # | | $ | ( | ) | ` | | ! | _ | | / | \ | ' | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | % | | ^ | [ | ] | ~ | | ? | = | , | < | > | "" | - // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' - // | | | | | | | | - // '--------+---------+---------' '-------+---------+---------' - display-name = "Chars"; - bindings = < - &kp RS(N6) &kp RS(BSLH) &kp RA(N2) &kp RS(RA(N8)) &kp RS(RA(N9)) &kp RA(N7) &kp MINUS &kp RS(FSLH) &trans &trans &kp RS(N0) &kp DEL - &kp RS(N3) &kp RS(N4) &kp RA(N4) &kp RS(N8) &kp RS(N9) &kp RS(EQUAL) &kp RS(N1) &kp FSLH &trans &kp RS(N7) &kp RS(RA(N7)) &kp BSLH - &kp RS(N5) &trans &kp RS(RBKT) &kp RA(N8) &kp RA(N9) &kp RA(RBKT) &kp RS(MINUS) &kp RS(N0) &kp COMMA &kp GRAVE &kp RS(GRAVE) &kp RS(N2) - &trans &mo 4 &trans &trans &trans &trans - >; - }; - - nav_layer { - // NAVIGATION Layer: Directions - // .--------------------------------------------------------------. .-----------------------------------------------------------. - // | | | | | | | | | PG DN | UP | PG UP | | PrtScn | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | CTRL | | | | | | | | LEFT | DOWN | RIGHT | | CAPS LCK | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | SHIFT | | | | | | | | PG HOME | | PG END | | | - // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' - // | GUI | | ALT | | | | | - // '--------+---------+---------' '-------+---------+---------' - display-name = "Nav"; - bindings = < - &trans &trans &trans &trans &trans &trans &trans &kp PG_DN &kp UP &kp PG_UP &trans &kp LG(LS(F4)) - &kp LCTRL &trans &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp RIGHT &trans &kp CLCK - &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp HOME &trans &kp END &trans &trans - &kp LGUI &trans &kp LALT &trans &trans &trans - >; - }; - - adjust_layer { - // ADJUST Layer: Setting and Configurations - // .------------------------------------------------------------. .-------------------------------------------------------------. - // | 0 | BT 0 | BT 1 | BT 2 | BT 3 | BT 4 | | BT CLR | RR | | FF | Bright Up| Vol up | - // |------------+---------+--------+--------+---------+---------| |---------+---------+---------+---------+----------+----------| - // | ExtPow ON | | | | | | | | Prev |Play/Pau.| Next | Bright Dn| Vol dn | - // |------------+---------+--------+--------+---------+---------| |---------+---------+---------+---------+----------+----------| - // | ExtPow OFF | | | | | | | | | | | | Mute | - // '-------------------------------+--------+---------+---------+ |---------+---------+---------+-------------------------------' - // | | | | | | | | - // '--------+---------+---------' '---------+---------+---------' - display-name = "Adjust"; - bindings = < - &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &kp C_RW &trans &kp C_FF &kp C_BRI_UP &kp C_VOL_UP - &trans &trans &trans &trans &trans &trans &trans &kp C_PREV &kp C_PP &kp C_NEXT &kp C_BRI_DN &kp C_VOL_DN - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp K_MUTE - &kp LALT &trans &trans &bl BL_TOG &trans &trans - >; - }; - - function_layer { - // Function Layer: Functionality - // .--------------------------------------------------------------. .-----------------------------------------------------------. - // | | | | | | | | | F7 | F8 | F9 | F12 | PrtScn | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | CTRL | | | | | | | | F6 | F5 | F4 | F11 | CAPS LCK | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | SHIFT | | | | | | | | F3 | F2 | F1 | | | - // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' - // | GUI | | ALT | | | | F10 | - // '--------+---------+---------' '-------+---------+---------' - display-name = "Function"; - bindings = < - &trans &trans &trans &trans &trans &trans &trans &kp F7 &kp F8 &kp F9 &kp F12 &kp LG(LS(F4)) - &kp LCTRL &trans &trans &trans &trans &trans &trans &kp F6 &kp F5 &kp F4 &kp F11 &kp CLCK - &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp F3 &kp F2 &kp F1 &kp F12 &trans - &kp LGUI &trans &kp LALT &trans &trans &kp F10 - >; - }; - - win_layer { - // Window Layer: Windows - // .--------------------------------------------------------------. .-----------------------------------------------------------. - // | | | | | | | | + | UL | UM | UR | F12 | PrtScn | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | CTRL | | | | | | | | ML | MM | MR | F11 | CAPS LCK | - // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| - // | SHIFT | | | | | | | - | BL | ML | MR | | | - // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' - // | GUI | | ALT | | | | F10 | - // '--------+---------+---------' '-------+---------+---------' - display-name = "Tile"; - bindings = < - &trans &trans &trans &trans &trans &trans &kp RC(RA(MINUS)) &kp RC(RA(U)) &kp RC(RA(UP)) &kp RC(RA(I)) &trans &kp LG(LS(N4)) - &kp LCTRL &trans &trans &trans &trans &trans &kp RC(RA(LEFT)) &kp RC(RA(D)) &kp RC(RA(F)) &kp RC(RA(G)) &kp RC(RA(RIGHT)) &kp CLCK - &kp LSHIFT &trans &trans &trans &trans &trans &kp RC(RA(FSLH)) &kp RC(RA(J)) &kp RC(RA(DOWN)) &kp RC(RA(K)) &trans &trans - &kp LGUI &trans &kp LALT &trans &trans &trans - >; - }; - - - - }; -}; + +#define KEYS_L LT0 LT1 LT2 LT3 LT4 LM0 LM1 LM2 LM3 LM4 LB0 LB1 LB2 LB3 LB4 // left-hand keys +#define KEYS_R RT0 RT1 RT2 RT3 RT4 RM0 RM1 RM2 RM3 RM4 RB0 RB1 RB2 RB3 RB4 // right-hand keys +#define THUMBS LH2 LH1 LH0 RH0 RH1 RH2 // thumb keys + +ZMK_BEHAVIOR(hml, hold_tap, // left-hand HRMs + flavor = "tap-preferred"; + tapping-term-ms = <280>; + quick-tap-ms = <125>; + bindings = <&kp>, <&kp>; + hold-trigger-key-positions = ; +) + +ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs + flavor = "tap-preferred"; + tapping-term-ms = <280>; + quick-tap-ms = <125>; + bindings = <&kp>, <&kp>; + hold-trigger-key-positions = ; +) + +// combos +#undef COMBO_TERM +#define COMBO_TERM 40 // timeout of 40ms (default is 30ms if omitted) +ZMK_COMBO(combo_copy, &kp LC(C), LB2 LB3, ALL) // Ctrl + C, active on all layers +ZMK_COMBO(combo_paste, &kp LC(V), LB1 LB2, ALL) // Ctrl + V, active on all layers + + + +ZMK_LAYER(default_layer, + // DEFAULT LAYER + // .--------------------------------------------------------------. .-----------------------------------------------------------. + // | ESC | Q | W | E/NAV | R/WIN | T | | Y | U | I | O | P | BKSP | + &kp ESC &kp Q &kp W < 3 E < 6 R &kp T &kp Y &kp U &kp I &kp O &kp P &kp DEL + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | CTRL/Tab | A | S | D | F | G | | H | J | K | L | Ö | Ä | + &mt LCTRL TAB &kp A &hm LALT S &hm LSHIFT D &hm LCTRL F &kp G &kp H &hm RCTRL J &hm RSHIFT K &hm RALT L &kp SEMI &kp LBKT + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | SHFT | Z | X | C | V | B/FUNC | | N | M | . | , | Å | NAV | + &kp LSHIFT &kp Z &kp X &kp C &kp V < 5 B &kp N &kp M &kp DOT &kp COMMA &trans &kp SQT + // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' + // | GUI | RSE | SPC | | ENT | LWR | LALT | + &kp LGUI &mo 1 &kp SPACE &mt 4 RET &mo 2 &kp BSPC + // '--------+---------+---------' '-------+---------+---------' + +) + + +ZMK_LAYER(numbers_layer, + // NUMBERS Layer: Media and Number Pad + // .--------------------------------------------------------------. .-----------------------------------------------------------. + // | ESC | | | | | Numlock | | / ? | 7 & | 8 * | 9 ( | - _ | BKSP | + &kp ESC &trans &trans &trans &trans &kp KP_NUMLOCK &kp FSLH &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp MINUS &kp BSPC + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | CTRL/Tab | | | | | | | * | 4 $ | 5 % | 6 ^ | , < | | + &mt LCTRL TAB &trans &trans &trans &trans &trans &kp STAR &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp COMMA &trans + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | SHIFT | | | | | | | | 1 ! | 2 @ | 3 # | = + | | + &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp EQUAL &trans + // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' + // | | | | | | | 0 ) | + &trans &trans &kp TAB &trans &mo 4 &kp NUMBER_0 + // '--------+---------+---------' '-------+---------+---------' +) + + +ZMK_LAYER(chars_layer, + // RAISE Layer: Special Chars + // .--------------------------------------------------------------. .-----------------------------------------------------------. + // | & | * | @ | { | } | | | | + | - | | | | DEL | + &kp RS(N6) &kp RS(BSLH) &kp RA(N2) &kp RS(RA(N8)) &kp RS(RA(N9)) &kp RA(N7) &kp MINUS &kp RS(FSLH) &trans &trans &kp RS(N0) &kp DEL + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | # | | $ | ( | ) | ` | | ! | _ | | / | \ | ' | + &kp RS(N3) &trans &kp RA(N4) &kp RS(N8) &kp RS(N9) &kp RS(EQUAL) &kp RS(N1) &kp FSLH &trans &kp RS(N7) &kp RS(RA(N7)) &kp BSLH + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | % | | ^ | [ | ] | ~ | | ? | = | , | < | > | "" | + &kp RS(N5) &trans &kp RS(RBKT) &kp RA(N8) &kp RA(N9) &kp RA(RBKT) &kp RS(MINUS) &kp RS(N0) &kp COMMA &kp GRAVE &kp RS(GRAVE) &kp RS(N2) + // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' + // | | | | | | | | + &trans &mo 4 &trans &trans &trans &trans + // '--------+---------+---------' '-------+---------+---------' +) + +ZMK_LAYER(navigation_layer, + // NAVIGATION Layer: Directions + // .--------------------------------------------------------------. .-----------------------------------------------------------. + // | | | | | | | | | PG DN | UP | PG UP | | PrtScn | + &trans &trans &trans &trans &trans &trans &trans &kp PG_DN &kp UP &kp PG_UP &trans &kp LG(LS(F4)) + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | CTRL | | | | | | | | LEFT | DOWN | RIGHT | | CAPS LCK | + &kp LCTRL &trans &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp RIGHT &trans &kp CLCK + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | SHIFT | | | | | | | | PG HOME | | PG END | | | + &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp HOME &trans &kp END &trans &trans + // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' + // | GUI | | ALT | | | | | + &kp LGUI &trans &kp LALT &trans &trans &trans + // '--------+---------+---------' '-------+---------+---------' +) + + + ZMK_LAYER(adjust_layer, + // ADJUST Layer: Setting and Configurations + // .------------------------------------------------------------. .-------------------------------------------------------------. + // | | BT 0 | BT 1 | BT 2 | BT 3 | BT 4 | | BT CLR | Rew | | FFwd | Bright Up| Vol Up | + &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &kp C_RW &trans &kp C_FF &kp C_BRI_UP &kp C_VOL_UP + // |------------+---------+--------+--------+---------+---------| |---------+---------+---------+---------+----------+----------| + // | | | | | | | | | Prev |Play/Paus| Next |Bright Dn | Vol Dn | + &trans &trans &trans &trans &trans &trans &trans &kp C_PREV &kp C_PP &kp C_NEXT &kp C_BRI_DN &kp C_VOL_DN + // |------------+---------+--------+--------+---------+---------| |---------+---------+---------+---------+----------+----------| + // | | | | | | | | | | | | | Mute | + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp K_MUTE + // '-------------------------------+--------+---------+---------+ |---------+---------+---------+-------------------------------' + // | GUI | | Alt | | Toggle | | | + &kp LGUI &trans &kp LALT &bl BL_TOG &trans &trans + // '--------+---------+---------' '---------+---------+---------' +) + + +ZMK_LAYER(function_layer, + // Function Layer: Functionality + // .--------------------------------------------------------------. .-----------------------------------------------------------. + // | | | | | | | | | F7 | F8 | F9 | F12 | PrtScn | + &trans &trans &trans &trans &trans &trans &trans &kp F7 &kp F8 &kp F9 &kp F12 &kp LG(LS(F4)) + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | CTRL | | | | | | | | F6 | F5 | F4 | F11 | CAPS LCK | + &kp LCTRL &trans &trans &trans &trans &trans &trans &kp F6 &kp F5 &kp F4 &kp F11 &kp CLCK + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | SHIFT | | | | | | | | F3 | F2 | F1 | | | + &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp F3 &kp F2 &kp F1 &trans &trans + // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' + // | GUI | | ALT | | | | F10 | + &kp LGUI &trans &kp LALT &trans &trans &kp F10 + // '--------+---------+---------' '-------+---------+---------' +) + + + ZMK_LAYER(win_layer, + // Window Layer: Windows + // .--------------------------------------------------------------. .-----------------------------------------------------------. + // | | | | | | | | + | UL | UM | UR | F12 | PrtScn | + &trans &trans &trans &trans &trans &trans &kp RC(RA(MINUS)) &kp RC(RA(U)) &kp RC(RA(UP)) &kp RC(RA(I)) &kp F12 &kp LG(LS(N4)) + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | CTRL | | | | | | | | ML | MM | MR | F11 | CAPS LCK | + &kp LCTRL &trans &trans &trans &trans &trans &trans &kp RC(RA(LEFT)) &kp RC(RA(D)) &kp RC(RA(F)) &kp F11 &kp CLCK + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | SHIFT | | | | | | | - | BL | ML | MR | | | + &kp LSHIFT &trans &trans &trans &trans &trans &kp RC(RA(FSLH)) &kp RC(RA(J)) &kp RC(RA(DOWN)) &kp RC(RA(K)) &trans &trans + // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' + // | GUI | | ALT | | | | F10 | + &kp LGUI &trans &kp LALT &trans &trans &kp F10 + // '--------+---------+---------' '-------+---------+---------' +) + diff --git a/zmk-helpers b/zmk-helpers new file mode 160000 index 0000000..e3c187a --- /dev/null +++ b/zmk-helpers @@ -0,0 +1 @@ +Subproject commit e3c187a324a86fe4c277405565720d85b31b6967 From 492972efda20bd5aad36be476e5096233adb8d68 Mon Sep 17 00:00:00 2001 From: Basim Ali Yoshiguchi Date: Tue, 14 May 2024 07:47:44 +0200 Subject: [PATCH 02/23] remove backlight traces --- config/corne.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index bddfa2c..0af283e 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -130,8 +130,8 @@ ZMK_LAYER(navigation_layer, // | | | | | | | | | | | | | Mute | &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp K_MUTE // '-------------------------------+--------+---------+---------+ |---------+---------+---------+-------------------------------' - // | GUI | | Alt | | Toggle | | | - &kp LGUI &trans &kp LALT &bl BL_TOG &trans &trans + // | GUI | | Alt | | | | | + &kp LGUI &trans &kp LALT &trans &trans &trans // '--------+---------+---------' '---------+---------+---------' ) From 84c168f8d0f95203fdf64e798c0027409b5095e2 Mon Sep 17 00:00:00 2001 From: Basim Ali Yoshiguchi Date: Tue, 14 May 2024 07:47:44 +0200 Subject: [PATCH 03/23] remove backlight traces --- config/corne.keymap | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index bddfa2c..ed988d3 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -7,7 +7,7 @@ #include #include #include -#include "../zmk-nodefree-config/helper.h" +#include "../zmk-helpers/helper.h" #define DEF 0 #define NUM 1 @@ -130,8 +130,8 @@ ZMK_LAYER(navigation_layer, // | | | | | | | | | | | | | Mute | &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp K_MUTE // '-------------------------------+--------+---------+---------+ |---------+---------+---------+-------------------------------' - // | GUI | | Alt | | Toggle | | | - &kp LGUI &trans &kp LALT &bl BL_TOG &trans &trans + // | GUI | | Alt | | | | | + &kp LGUI &trans &kp LALT &trans &trans &trans // '--------+---------+---------' '---------+---------+---------' ) From 46ea2694d4381daa97f713f30525455e23e83dc3 Mon Sep 17 00:00:00 2001 From: Basim Ali Yoshiguchi Date: Tue, 14 May 2024 08:13:52 +0200 Subject: [PATCH 04/23] correct helper name --- config/corne.keymap | 1 + 1 file changed, 1 insertion(+) diff --git a/config/corne.keymap b/config/corne.keymap index ed988d3..25357e3 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -38,6 +38,7 @@ ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs hold-trigger-key-positions = ; ) + // combos #undef COMBO_TERM #define COMBO_TERM 40 // timeout of 40ms (default is 30ms if omitted) From 193eb6047f6e0f9d28f1cb5839927ff892af36e9 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Tue, 14 May 2024 08:26:46 +0200 Subject: [PATCH 05/23] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d74fb89..2ba738f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,4 +2,4 @@ on: [push, pull_request, workflow_dispatch] jobs: build: - uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main + uses: urob/zmk/.github/workflows/build-user-config.yml@build-with-submodules From 1239ef35b6e6d50b1b8016d15ec331ac9df2990a Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Tue, 14 May 2024 15:54:21 +0200 Subject: [PATCH 06/23] Repair devicetree file --- config/corne.keymap | 55 ++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 25357e3..93884a1 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -8,6 +8,7 @@ #include #include #include "../zmk-helpers/helper.h" +#include "../zmk-helpers/keypos_def/keypos_42keys.h" #define DEF 0 #define NUM 1 @@ -22,6 +23,8 @@ #define KEYS_R RT0 RT1 RT2 RT3 RT4 RM0 RM1 RM2 RM3 RM4 RB0 RB1 RB2 RB3 RB4 // right-hand keys #define THUMBS LH2 LH1 LH0 RH0 RH1 RH2 // thumb keys +#define ___ &trans + ZMK_BEHAVIOR(hml, hold_tap, // left-hand HRMs flavor = "tap-preferred"; tapping-term-ms = <280>; @@ -54,10 +57,10 @@ ZMK_LAYER(default_layer, &kp ESC &kp Q &kp W < 3 E < 6 R &kp T &kp Y &kp U &kp I &kp O &kp P &kp DEL // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | CTRL/Tab | A | S | D | F | G | | H | J | K | L | Ö | Ä | - &mt LCTRL TAB &kp A &hm LALT S &hm LSHIFT D &hm LCTRL F &kp G &kp H &hm RCTRL J &hm RSHIFT K &hm RALT L &kp SEMI &kp LBKT + &mt LCTRL TAB &kp A &hmr LALT S &hmr LSHIFT D &hmr LCTRL F &kp G &kp H &hml RCTRL J &hml RSHIFT K &hml RALT L &kp SEMI &kp LBKT // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | SHFT | Z | X | C | V | B/FUNC | | N | M | . | , | Å | NAV | - &kp LSHIFT &kp Z &kp X &kp C &kp V < 5 B &kp N &kp M &kp DOT &kp COMMA &trans &kp SQT + &kp LSHIFT &kp Z &kp X &kp C &kp V < 5 B &kp N &kp M &kp DOT &kp COMMA ___ &kp SQT // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' // | GUI | RSE | SPC | | ENT | LWR | LALT | &kp LGUI &mo 1 &kp SPACE &mt 4 RET &mo 2 &kp BSPC @@ -70,16 +73,16 @@ ZMK_LAYER(numbers_layer, // NUMBERS Layer: Media and Number Pad // .--------------------------------------------------------------. .-----------------------------------------------------------. // | ESC | | | | | Numlock | | / ? | 7 & | 8 * | 9 ( | - _ | BKSP | - &kp ESC &trans &trans &trans &trans &kp KP_NUMLOCK &kp FSLH &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp MINUS &kp BSPC + &kp ESC ___ ___ ___ ___ &kp KP_NUMLOCK &kp FSLH &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp MINUS &kp BSPC // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | CTRL/Tab | | | | | | | * | 4 $ | 5 % | 6 ^ | , < | | - &mt LCTRL TAB &trans &trans &trans &trans &trans &kp STAR &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp COMMA &trans + &mt LCTRL TAB ___ ___ ___ ___ ___ &kp STAR &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp COMMA ___ // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | SHIFT | | | | | | | | 1 ! | 2 @ | 3 # | = + | | - &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp EQUAL &trans + &kp LSHIFT ___ ___ ___ ___ ___ ___ &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp EQUAL ___ // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' // | | | | | | | 0 ) | - &trans &trans &kp TAB &trans &mo 4 &kp NUMBER_0 + ___ ___ &kp TAB ___ &mo 4 &kp NUMBER_0 // '--------+---------+---------' '-------+---------+---------' ) @@ -88,16 +91,16 @@ ZMK_LAYER(chars_layer, // RAISE Layer: Special Chars // .--------------------------------------------------------------. .-----------------------------------------------------------. // | & | * | @ | { | } | | | | + | - | | | | DEL | - &kp RS(N6) &kp RS(BSLH) &kp RA(N2) &kp RS(RA(N8)) &kp RS(RA(N9)) &kp RA(N7) &kp MINUS &kp RS(FSLH) &trans &trans &kp RS(N0) &kp DEL + &kp RS(N6) &kp RS(BSLH) &kp RA(N2) &kp RS(RA(N8)) &kp RS(RA(N9)) &kp RA(N7) &kp MINUS &kp RS(FSLH) ___ ___ &kp RS(N0) &kp DEL // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | # | | $ | ( | ) | ` | | ! | _ | | / | \ | ' | - &kp RS(N3) &trans &kp RA(N4) &kp RS(N8) &kp RS(N9) &kp RS(EQUAL) &kp RS(N1) &kp FSLH &trans &kp RS(N7) &kp RS(RA(N7)) &kp BSLH + &kp RS(N3) ___ &kp RA(N4) &kp RS(N8) &kp RS(N9) &kp RS(EQUAL) &kp RS(N1) &kp FSLH ___ &kp RS(N7) &kp RS(RA(N7)) &kp BSLH // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | % | | ^ | [ | ] | ~ | | ? | = | , | < | > | "" | - &kp RS(N5) &trans &kp RS(RBKT) &kp RA(N8) &kp RA(N9) &kp RA(RBKT) &kp RS(MINUS) &kp RS(N0) &kp COMMA &kp GRAVE &kp RS(GRAVE) &kp RS(N2) + &kp RS(N5) ___ &kp RS(RBKT) &kp RA(N8) &kp RA(N9) &kp RA(RBKT) &kp RS(MINUS) &kp RS(N0) &kp COMMA &kp GRAVE &kp RS(GRAVE) &kp RS(N2) // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' // | | | | | | | | - &trans &mo 4 &trans &trans &trans &trans + ___ &mo 4 ___ ___ ___ ___ // '--------+---------+---------' '-------+---------+---------' ) @@ -105,16 +108,16 @@ ZMK_LAYER(navigation_layer, // NAVIGATION Layer: Directions // .--------------------------------------------------------------. .-----------------------------------------------------------. // | | | | | | | | | PG DN | UP | PG UP | | PrtScn | - &trans &trans &trans &trans &trans &trans &trans &kp PG_DN &kp UP &kp PG_UP &trans &kp LG(LS(F4)) + ___ ___ ___ ___ ___ ___ ___ &kp PG_DN &kp UP &kp PG_UP ___ &kp LG(LS(F4)) // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | CTRL | | | | | | | | LEFT | DOWN | RIGHT | | CAPS LCK | - &kp LCTRL &trans &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp RIGHT &trans &kp CLCK + &kp LCTRL ___ ___ ___ ___ ___ ___ &kp LEFT &kp DOWN &kp RIGHT ___ &kp CLCK // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | SHIFT | | | | | | | | PG HOME | | PG END | | | - &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp HOME &trans &kp END &trans &trans + &kp LSHIFT ___ ___ ___ ___ ___ ___ &kp HOME ___ &kp END ___ ___ // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' // | GUI | | ALT | | | | | - &kp LGUI &trans &kp LALT &trans &trans &trans + &kp LGUI ___ &kp LALT ___ ___ ___ // '--------+---------+---------' '-------+---------+---------' ) @@ -123,16 +126,16 @@ ZMK_LAYER(navigation_layer, // ADJUST Layer: Setting and Configurations // .------------------------------------------------------------. .-------------------------------------------------------------. // | | BT 0 | BT 1 | BT 2 | BT 3 | BT 4 | | BT CLR | Rew | | FFwd | Bright Up| Vol Up | - &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &kp C_RW &trans &kp C_FF &kp C_BRI_UP &kp C_VOL_UP + ___ &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &kp C_RW ___ &kp C_FF &kp C_BRI_UP &kp C_VOL_UP // |------------+---------+--------+--------+---------+---------| |---------+---------+---------+---------+----------+----------| // | | | | | | | | | Prev |Play/Paus| Next |Bright Dn | Vol Dn | - &trans &trans &trans &trans &trans &trans &trans &kp C_PREV &kp C_PP &kp C_NEXT &kp C_BRI_DN &kp C_VOL_DN + ___ ___ ___ ___ ___ ___ ___ &kp C_PREV &kp C_PP &kp C_NEXT &kp C_BRI_DN &kp C_VOL_DN // |------------+---------+--------+--------+---------+---------| |---------+---------+---------+---------+----------+----------| // | | | | | | | | | | | | | Mute | - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp K_MUTE + ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ &kp K_MUTE // '-------------------------------+--------+---------+---------+ |---------+---------+---------+-------------------------------' // | GUI | | Alt | | | | | - &kp LGUI &trans &kp LALT &trans &trans &trans + &kp LGUI ___ &kp LALT ___ ___ ___ // '--------+---------+---------' '---------+---------+---------' ) @@ -141,16 +144,16 @@ ZMK_LAYER(function_layer, // Function Layer: Functionality // .--------------------------------------------------------------. .-----------------------------------------------------------. // | | | | | | | | | F7 | F8 | F9 | F12 | PrtScn | - &trans &trans &trans &trans &trans &trans &trans &kp F7 &kp F8 &kp F9 &kp F12 &kp LG(LS(F4)) + ___ ___ ___ ___ ___ ___ ___ &kp F7 &kp F8 &kp F9 &kp F12 &kp LG(LS(F4)) // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | CTRL | | | | | | | | F6 | F5 | F4 | F11 | CAPS LCK | - &kp LCTRL &trans &trans &trans &trans &trans &trans &kp F6 &kp F5 &kp F4 &kp F11 &kp CLCK + &kp LCTRL ___ ___ ___ ___ ___ ___ &kp F6 &kp F5 &kp F4 &kp F11 &kp CLCK // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | SHIFT | | | | | | | | F3 | F2 | F1 | | | - &kp LSHIFT &trans &trans &trans &trans &trans &trans &kp F3 &kp F2 &kp F1 &trans &trans + &kp LSHIFT ___ ___ ___ ___ ___ ___ &kp F3 &kp F2 &kp F1 ___ ___ // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' // | GUI | | ALT | | | | F10 | - &kp LGUI &trans &kp LALT &trans &trans &kp F10 + &kp LGUI ___ &kp LALT ___ ___ &kp F10 // '--------+---------+---------' '-------+---------+---------' ) @@ -159,16 +162,16 @@ ZMK_LAYER(function_layer, // Window Layer: Windows // .--------------------------------------------------------------. .-----------------------------------------------------------. // | | | | | | | | + | UL | UM | UR | F12 | PrtScn | - &trans &trans &trans &trans &trans &trans &kp RC(RA(MINUS)) &kp RC(RA(U)) &kp RC(RA(UP)) &kp RC(RA(I)) &kp F12 &kp LG(LS(N4)) + ___ ___ ___ ___ ___ ___ &kp RC(RA(MINUS)) &kp RC(RA(U)) &kp RC(RA(UP)) &kp RC(RA(I)) &kp F12 &kp LG(LS(N4)) // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | CTRL | | | | | | | | ML | MM | MR | F11 | CAPS LCK | - &kp LCTRL &trans &trans &trans &trans &trans &trans &kp RC(RA(LEFT)) &kp RC(RA(D)) &kp RC(RA(F)) &kp F11 &kp CLCK + &kp LCTRL ___ ___ ___ ___ ___ ___ &kp RC(RA(LEFT)) &kp RC(RA(D)) &kp RC(RA(F)) &kp F11 &kp CLCK // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | SHIFT | | | | | | | - | BL | ML | MR | | | - &kp LSHIFT &trans &trans &trans &trans &trans &kp RC(RA(FSLH)) &kp RC(RA(J)) &kp RC(RA(DOWN)) &kp RC(RA(K)) &trans &trans + &kp LSHIFT ___ ___ ___ ___ ___ &kp RC(RA(FSLH)) &kp RC(RA(J)) &kp RC(RA(DOWN)) &kp RC(RA(K)) ___ ___ // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' // | GUI | | ALT | | | | F10 | - &kp LGUI &trans &kp LALT &trans &trans &kp F10 + &kp LGUI ___ &kp LALT ___ ___ &kp F10 // '--------+---------+---------' '-------+---------+---------' ) From d5dcd95c774f1ba8280cfceb9fd294053324a5fd Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Tue, 14 May 2024 16:06:45 +0200 Subject: [PATCH 07/23] Update corne.keymap --- config/corne.keymap | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 93884a1..afa84cb 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -50,7 +50,7 @@ ZMK_COMBO(combo_paste, &kp LC(V), LB1 LB2, ALL) // Ctrl + V, active on all la -ZMK_LAYER(default_layer, +ZMK_LAYER(Main, // DEFAULT LAYER // .--------------------------------------------------------------. .-----------------------------------------------------------. // | ESC | Q | W | E/NAV | R/WIN | T | | Y | U | I | O | P | BKSP | @@ -69,7 +69,7 @@ ZMK_LAYER(default_layer, ) -ZMK_LAYER(numbers_layer, +ZMK_LAYER(Numbers, // NUMBERS Layer: Media and Number Pad // .--------------------------------------------------------------. .-----------------------------------------------------------. // | ESC | | | | | Numlock | | / ? | 7 & | 8 * | 9 ( | - _ | BKSP | @@ -87,7 +87,7 @@ ZMK_LAYER(numbers_layer, ) -ZMK_LAYER(chars_layer, +ZMK_LAYER(Symbols, // RAISE Layer: Special Chars // .--------------------------------------------------------------. .-----------------------------------------------------------. // | & | * | @ | { | } | | | | + | - | | | | DEL | @@ -104,7 +104,7 @@ ZMK_LAYER(chars_layer, // '--------+---------+---------' '-------+---------+---------' ) -ZMK_LAYER(navigation_layer, +ZMK_LAYER(Navi, // NAVIGATION Layer: Directions // .--------------------------------------------------------------. .-----------------------------------------------------------. // | | | | | | | | | PG DN | UP | PG UP | | PrtScn | @@ -122,7 +122,7 @@ ZMK_LAYER(navigation_layer, ) - ZMK_LAYER(adjust_layer, + ZMK_LAYER(Adjust, // ADJUST Layer: Setting and Configurations // .------------------------------------------------------------. .-------------------------------------------------------------. // | | BT 0 | BT 1 | BT 2 | BT 3 | BT 4 | | BT CLR | Rew | | FFwd | Bright Up| Vol Up | @@ -140,7 +140,7 @@ ZMK_LAYER(navigation_layer, ) -ZMK_LAYER(function_layer, +ZMK_LAYER(Func, // Function Layer: Functionality // .--------------------------------------------------------------. .-----------------------------------------------------------. // | | | | | | | | | F7 | F8 | F9 | F12 | PrtScn | @@ -158,7 +158,7 @@ ZMK_LAYER(function_layer, ) - ZMK_LAYER(win_layer, + ZMK_LAYER(Tiling, // Window Layer: Windows // .--------------------------------------------------------------. .-----------------------------------------------------------. // | | | | | | | | + | UL | UM | UR | F12 | PrtScn | From 2e66feb4fd21bc2dbac07a6bed191eb1d4353fbb Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Tue, 14 May 2024 18:31:52 +0200 Subject: [PATCH 08/23] Adapt to Linux --- config/corne.keymap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/corne.keymap b/config/corne.keymap index afa84cb..afdd9cf 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -10,6 +10,8 @@ #include "../zmk-helpers/helper.h" #include "../zmk-helpers/keypos_def/keypos_42keys.h" +#define HOST_OS LINUX // Needed for unicode international_chars + #define DEF 0 #define NUM 1 #define CHARS 2 From bbc2bfb89113f57e39584f56707d923d492d2490 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Tue, 14 May 2024 18:37:00 +0200 Subject: [PATCH 09/23] Create constants.h --- config/constants.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 config/constants.h diff --git a/config/constants.h b/config/constants.h new file mode 100644 index 0000000..3a2be85 --- /dev/null +++ b/config/constants.h @@ -0,0 +1,18 @@ +#pragma once + +// Keys +#define ___ &trans +#define XXX &none + +#define DEF 0 +#define NUM 1 +#define CHARS 2 +#define NAVI 3 +#define ADJS 4 +#define FUNC 5 +#define WIN 6 + +// OS +#define WINDOWS 0 +#define LINUX 1 +#define MAC_OS 2 From 4e4a79a9f7a4d0c2cc859edbaf5a0cc34a88f004 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Tue, 14 May 2024 18:39:07 +0200 Subject: [PATCH 10/23] Update corne.keymap --- config/corne.keymap | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index afdd9cf..57b392d 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -10,22 +10,9 @@ #include "../zmk-helpers/helper.h" #include "../zmk-helpers/keypos_def/keypos_42keys.h" +#include "constants.h" #define HOST_OS LINUX // Needed for unicode international_chars -#define DEF 0 -#define NUM 1 -#define CHARS 2 -#define NAVI 3 -#define ADJS 4 -#define FUNC 5 -#define WIN 6 - - -#define KEYS_L LT0 LT1 LT2 LT3 LT4 LM0 LM1 LM2 LM3 LM4 LB0 LB1 LB2 LB3 LB4 // left-hand keys -#define KEYS_R RT0 RT1 RT2 RT3 RT4 RM0 RM1 RM2 RM3 RM4 RB0 RB1 RB2 RB3 RB4 // right-hand keys -#define THUMBS LH2 LH1 LH0 RH0 RH1 RH2 // thumb keys - -#define ___ &trans ZMK_BEHAVIOR(hml, hold_tap, // left-hand HRMs flavor = "tap-preferred"; From 290a4b9d1dd94ca29d2e3e38ad1966856086d447 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Wed, 15 May 2024 14:16:21 +0200 Subject: [PATCH 11/23] Update corne.keymap --- config/corne.keymap | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 57b392d..a6421e7 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -16,7 +16,7 @@ ZMK_BEHAVIOR(hml, hold_tap, // left-hand HRMs flavor = "tap-preferred"; - tapping-term-ms = <280>; + tapping-term-ms = <200>; quick-tap-ms = <125>; bindings = <&kp>, <&kp>; hold-trigger-key-positions = ; @@ -24,7 +24,7 @@ ZMK_BEHAVIOR(hml, hold_tap, // left-hand HRMs ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs flavor = "tap-preferred"; - tapping-term-ms = <280>; + tapping-term-ms = <200>; quick-tap-ms = <125>; bindings = <&kp>, <&kp>; hold-trigger-key-positions = ; @@ -34,8 +34,8 @@ ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs // combos #undef COMBO_TERM #define COMBO_TERM 40 // timeout of 40ms (default is 30ms if omitted) -ZMK_COMBO(combo_copy, &kp LC(C), LB2 LB3, ALL) // Ctrl + C, active on all layers -ZMK_COMBO(combo_paste, &kp LC(V), LB1 LB2, ALL) // Ctrl + V, active on all layers +ZMK_COMBO(combo_copy, &kp LS(LC(C)), LB2 LB3, ALL) // Ctrl + C, active on all layers +ZMK_COMBO(combo_paste, &kp LS(LC(V)), LB1 LB2, ALL) // Ctrl + V, active on all layers From a75f1ffc78b84f248ce4d2a42cd26017939e642f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 15 May 2024 21:39:20 +0200 Subject: [PATCH 12/23] add pre commit check --- .pre-commit-config.yaml | 28 ++++++++++++++++++++++++++++ config/corne.keymap | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..e0666ea --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,28 @@ +fail_fast: false +repos: + - repo: https://github.com/Lucas-C/pre-commit-hooks + rev: v1.5.1 + hooks: + - id: remove-tabs + exclude: "vendor-prefixes\\.txt$" + - repo: https://github.com/pocc/pre-commit-hooks + rev: v1.3.5 + hooks: + - id: clang-format + args: + - -i + - repo: https://github.com/pre-commit/mirrors-prettier + rev: v2.7.1 + hooks: + - id: prettier + # Workaround for https://github.com/pre-commit/mirrors-prettier/issues/29 + additional_dependencies: + - prettier@2.8.7 + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.4.0 + hooks: + - id: trailing-whitespace + - id: check-yaml + - id: check-added-large-files + - id: check-shebang-scripts-are-executable + exclude: "\\.mustache$" diff --git a/config/corne.keymap b/config/corne.keymap index 25357e3..a23971a 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -9,6 +9,7 @@ #include #include "../zmk-helpers/helper.h" + #define DEF 0 #define NUM 1 #define CHARS 2 @@ -62,7 +63,7 @@ ZMK_LAYER(default_layer, // | GUI | RSE | SPC | | ENT | LWR | LALT | &kp LGUI &mo 1 &kp SPACE &mt 4 RET &mo 2 &kp BSPC // '--------+---------+---------' '-------+---------+---------' - + ) From 2620492bb5910999c28238cf4ff9d1ef9ea450ab Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Wed, 15 May 2024 22:51:52 +0200 Subject: [PATCH 13/23] Update corne.keymap --- config/corne.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 325fc53..0dabadd 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -9,8 +9,8 @@ #include #include "../zmk-helpers/helper.h" #include "../zmk-helpers/keypos_def/keypos_42keys.h" -#include "constants.h" - +//#include "constants.h" +#define ___ &trans #define DEF 0 #define NUM 1 From 873eaa69584b2c84c7be9a3e987030875a793e45 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Wed, 15 May 2024 22:56:47 +0200 Subject: [PATCH 14/23] Update corne.keymap --- config/corne.keymap | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 0dabadd..8392759 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -9,8 +9,6 @@ #include #include "../zmk-helpers/helper.h" #include "../zmk-helpers/keypos_def/keypos_42keys.h" -//#include "constants.h" -#define ___ &trans #define DEF 0 #define NUM 1 @@ -20,6 +18,14 @@ #define FUNC 5 #define WIN 6 +#define LINUX 1 + +#define KEYS_L LT0 LT1 LT2 LT3 LT4 LM0 LM1 LM2 LM3 LM4 LB0 LB1 LB2 LB3 LB4 // left-hand keys +#define KEYS_R RT0 RT1 RT2 RT3 RT4 RM0 RM1 RM2 RM3 RM4 RB0 RB1 RB2 RB3 RB4 // right-hand keys +#define THUMBS LH2 LH1 LH0 RH0 RH1 RH2 // thumb keys + +#define ___ &trans + #define HOST_OS LINUX // Needed for unicode international_chars ZMK_BEHAVIOR(hml, hold_tap, // left-hand HRMs From ffcd8a63a5a53fc5593081cd086ae2baae8157d5 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Wed, 15 May 2024 23:22:25 +0200 Subject: [PATCH 15/23] Update corne.keymap --- config/corne.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 8392759..71f136b 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -48,8 +48,8 @@ ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs // combos #undef COMBO_TERM #define COMBO_TERM 40 // timeout of 40ms (default is 30ms if omitted) -ZMK_COMBO(combo_copy, &kp LS(LC(C)), LB2 LB3, ALL) // Ctrl + C, active on all layers -ZMK_COMBO(combo_paste, &kp LS(LC(V)), LB1 LB2, ALL) // Ctrl + V, active on all layers +ZMK_COMBO(combo_copy, &kp LC(C), LB2 LB3, ALL) // Ctrl + C, active on all layers +ZMK_COMBO(combo_paste, &kp LC(V), LB1 LB2, ALL) // Ctrl + V, active on all layers From 03fbd4f30c53ec946fa3a028048279ec984219e3 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Wed, 22 May 2024 12:15:08 +0200 Subject: [PATCH 16/23] add gaming layer --- config/corne.keymap | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/config/corne.keymap b/config/corne.keymap index 71f136b..1f5e394 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -17,6 +17,7 @@ #define ADJS 4 #define FUNC 5 #define WIN 6 +#define GAM 7 #define LINUX 1 @@ -72,6 +73,7 @@ ZMK_LAYER(Main, ) + ZMK_LAYER(Numbers, // NUMBERS Layer: Media and Number Pad // .--------------------------------------------------------------. .-----------------------------------------------------------. @@ -178,3 +180,21 @@ ZMK_LAYER(Func, // '--------+---------+---------' '-------+---------+---------' ) +ZMK_LAYER(Game, + // DEFAULT LAYER + // .--------------------------------------------------------------. .-----------------------------------------------------------. + // | ESC | Q | W | E/NAV | R/NAV | T | | Y | U | I | O | P | BKSP | + &kp ESC &kp Q &kp W &kp E < 3 R &kp T &kp Y &kp U &kp I &kp O &kp P &kp DEL + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | CTRL/Tab | A | S | D | F | G | | H | J | K | L | Ö | Ä | + &mt LCTRL TAB &kp A &kp S &kp D &kp F &kp G &kp H &hml RCTRL J &hml RSHIFT K &hml RALT L &kp SEMI &kp LBKT + // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| + // | SHFT | Z | X | C | V | B/FUNC | | N | M | . | , | Å | NAV | + &kp LSHIFT &kp Z &kp X &kp C &kp V < 5 B &kp N &kp M &kp DOT &kp COMMA ___ &kp SQT + // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' + // | GUI | RSE | SPC | | ENT | LWR | LALT | + &kp LGUI &mo 1 &kp SPACE &mt 4 RET &mo 2 &kp BSPC + // '--------+---------+---------' '-------+---------+---------' + +) + From ed168c37666249cfb5a5905cb8f614152c10cd59 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Wed, 22 May 2024 13:46:02 +0200 Subject: [PATCH 17/23] add toggle gaming layer --- config/corne.keymap | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 1f5e394..32fd5cb 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -49,8 +49,9 @@ ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs // combos #undef COMBO_TERM #define COMBO_TERM 40 // timeout of 40ms (default is 30ms if omitted) -ZMK_COMBO(combo_copy, &kp LC(C), LB2 LB3, ALL) // Ctrl + C, active on all layers -ZMK_COMBO(combo_paste, &kp LC(V), LB1 LB2, ALL) // Ctrl + V, active on all layers +ZMK_COMBO(combo_copy, &kp LC(C), LB2 LB3, DEF NUM CHARS NAVI ADJS FUNC WIN) // Ctrl + C, active on all layers except gaming +ZMK_COMBO(combo_paste, &kp LC(V), LB1 LB2, DEF NUM CHARS NAVI ADJS FUNC WIN) // Ctrl + V, active on all layers except gaming +ZMK_COMBO(toggle_game, &tog GAM, RT1 RT4, DEF) // toggle gaming layer on main From e85c6225af30813034ff3ad7eb068f7f610f474f Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Wed, 26 Jun 2024 13:21:28 +0200 Subject: [PATCH 18/23] Update corne.conf Increase bluetooth power --- config/corne.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/config/corne.conf b/config/corne.conf index 7fb4dc2..f89c6cd 100644 --- a/config/corne.conf +++ b/config/corne.conf @@ -21,3 +21,4 @@ CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000 CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=5 CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=5 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=6 +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y From aa73e4c7303eea6421060182eeab43af4f6f3792 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Mon, 7 Oct 2024 09:29:26 +0200 Subject: [PATCH 19/23] Update corne.keymap --- config/corne.keymap | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 32fd5cb..208186a 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -31,16 +31,16 @@ ZMK_BEHAVIOR(hml, hold_tap, // left-hand HRMs flavor = "tap-preferred"; - tapping-term-ms = <200>; - quick-tap-ms = <125>; + tapping-term-ms = <100>; + quick-tap-ms = <70>; bindings = <&kp>, <&kp>; hold-trigger-key-positions = ; ) ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs flavor = "tap-preferred"; - tapping-term-ms = <200>; - quick-tap-ms = <125>; + tapping-term-ms = <100>; + quick-tap-ms = <70>; bindings = <&kp>, <&kp>; hold-trigger-key-positions = ; ) @@ -97,19 +97,20 @@ ZMK_LAYER(Symbols, // RAISE Layer: Special Chars // .--------------------------------------------------------------. .-----------------------------------------------------------. // | & | * | @ | { | } | | | | + | - | | | | DEL | - &kp RS(N6) &kp RS(BSLH) &kp RA(N2) &kp RS(RA(N8)) &kp RS(RA(N9)) &kp RA(N7) &kp MINUS &kp RS(FSLH) ___ ___ &kp RS(N0) &kp DEL + &kp AMPERSAND &kp ASTERISK &kp AT &kp LEFT_BRACE &kp RIGHT_BRACE &kp PIPE &kp PLUS &kp MINUS ___ ___ &kp EQUAL &kp DELETE // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | # | | $ | ( | ) | ` | | ! | _ | | / | \ | ' | - &kp RS(N3) ___ &kp RA(N4) &kp RS(N8) &kp RS(N9) &kp RS(EQUAL) &kp RS(N1) &kp FSLH ___ &kp RS(N7) &kp RS(RA(N7)) &kp BSLH + &kp HASH ___ &kp DOLLAR &kp LEFT_PAREN &kp RIGHT_PAREN &kp GRAVE &kp EXCLAMATION &kp UNDERSCORE ___ &kp SLASH &kp BACKSLASH &kp APOSTROPHE // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | % | | ^ | [ | ] | ~ | | ? | = | , | < | > | "" | - &kp RS(N5) ___ &kp RS(RBKT) &kp RA(N8) &kp RA(N9) &kp RA(RBKT) &kp RS(MINUS) &kp RS(N0) &kp COMMA &kp GRAVE &kp RS(GRAVE) &kp RS(N2) + &kp PERCENT ___ &kp CARET &kp LEFT_BRACKET &kp RIGHT_BRACKET &kp TILDE &kp QUESTION &kp EQUAL &kp COMMA &kp LESS_THAN &kp GREATER_THAN &kp DOUBLE_QUOTE // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' // | | | | | | | | ___ &mo 4 ___ ___ ___ ___ // '--------+---------+---------' '-------+---------+---------' ) + ZMK_LAYER(Navi, // NAVIGATION Layer: Directions // .--------------------------------------------------------------. .-----------------------------------------------------------. From de679170f64aa305834a53c66d4c165fdc89ca73 Mon Sep 17 00:00:00 2001 From: Simsalaba Date: Wed, 8 Apr 2026 09:42:26 +0200 Subject: [PATCH 20/23] Update build workflow to use new ZMK repository --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ba738f..18f82cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,6 @@ +name: Build ZMK firmware on: [push, pull_request, workflow_dispatch] jobs: build: - uses: urob/zmk/.github/workflows/build-user-config.yml@build-with-submodules + uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@v0.3 From 3183897bfa4efa1395bae919e6d5e06145a569a4 Mon Sep 17 00:00:00 2001 From: simsalaba Date: Wed, 29 Apr 2026 09:25:23 +0200 Subject: [PATCH 21/23] Fix gaming layer toggle combo to work in both directions The toggle_game combo was only active on DEF layer, making it impossible to exit the gaming layer without re-flashing. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- config/corne.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/corne.keymap b/config/corne.keymap index 208186a..282ef59 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -51,7 +51,7 @@ ZMK_BEHAVIOR(hmr, hold_tap, // right-hand HRMs #define COMBO_TERM 40 // timeout of 40ms (default is 30ms if omitted) ZMK_COMBO(combo_copy, &kp LC(C), LB2 LB3, DEF NUM CHARS NAVI ADJS FUNC WIN) // Ctrl + C, active on all layers except gaming ZMK_COMBO(combo_paste, &kp LC(V), LB1 LB2, DEF NUM CHARS NAVI ADJS FUNC WIN) // Ctrl + V, active on all layers except gaming -ZMK_COMBO(toggle_game, &tog GAM, RT1 RT4, DEF) // toggle gaming layer on main +ZMK_COMBO(toggle_game, &tog GAM, RT1 RT4, DEF GAM) // toggle gaming layer on/off From 6a5d181e99f65f57f89ffd751e1d3656c8c047f2 Mon Sep 17 00:00:00 2001 From: simsalaba Date: Wed, 29 Apr 2026 09:41:01 +0200 Subject: [PATCH 22/23] Migrate zmk-helpers from git submodule to west module (v2) - Remove git submodule dependency on urob/zmk-helpers - Add zmk-helpers as a west module in west.yml (revision v0.3) - Update include paths to use angle-bracket includes - Pin ZMK to v0.3 release tag - Override KEYS_L/KEYS_R/THUMBS to exclude outer columns for HRM Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .gitignore | 1 + .gitmodules | 3 --- config/corne.keymap | 8 ++++++-- config/west.yml | 7 ++++++- zmk-helpers | 1 - 5 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 .gitignore delete mode 100644 .gitmodules delete mode 160000 zmk-helpers diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 07fc0de..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "zmk-helpers"] - path = zmk-helpers - url = https://github.com/urob/zmk-helpers.git diff --git a/config/corne.keymap b/config/corne.keymap index 282ef59..9060354 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -7,8 +7,8 @@ #include #include #include -#include "../zmk-helpers/helper.h" -#include "../zmk-helpers/keypos_def/keypos_42keys.h" +#include +#include #define DEF 0 #define NUM 1 @@ -21,6 +21,10 @@ #define LINUX 1 +// Override key groups from 42.h to exclude outer columns (for HRM trigger positions) +#undef KEYS_L +#undef KEYS_R +#undef THUMBS #define KEYS_L LT0 LT1 LT2 LT3 LT4 LM0 LM1 LM2 LM3 LM4 LB0 LB1 LB2 LB3 LB4 // left-hand keys #define KEYS_R RT0 RT1 RT2 RT3 RT4 RM0 RM1 RM2 RM3 RM4 RB0 RB1 RB2 RB3 RB4 // right-hand keys #define THUMBS LH2 LH1 LH0 RH0 RH1 RH2 // thumb keys diff --git a/config/west.yml b/config/west.yml index 379d291..0f8e50e 100644 --- a/config/west.yml +++ b/config/west.yml @@ -2,10 +2,15 @@ manifest: remotes: - name: zmkfirmware url-base: https://github.com/zmkfirmware + - name: urob + url-base: https://github.com/urob projects: - name: zmk remote: zmkfirmware - revision: main + revision: v0.3 import: app/west.yml + - name: zmk-helpers + remote: urob + revision: v0.3 self: path: config diff --git a/zmk-helpers b/zmk-helpers deleted file mode 160000 index e3c187a..0000000 --- a/zmk-helpers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e3c187a324a86fe4c277405565720d85b31b6967 From 773601caf2dc85f524807cdad35405b257018bea Mon Sep 17 00:00:00 2001 From: simsalaba Date: Wed, 29 Apr 2026 09:52:27 +0200 Subject: [PATCH 23/23] Fix invalid keycodes for ZMK v0.3 - DOUBLE_QUOTE -> DQT (DOUBLE_QUOTE not defined in v0.3) - LEFT_PAREN -> LPAR - RIGHT_PAREN -> RPAR Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- config/corne.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/corne.keymap b/config/corne.keymap index 9060354..312ca90 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -104,10 +104,10 @@ ZMK_LAYER(Symbols, &kp AMPERSAND &kp ASTERISK &kp AT &kp LEFT_BRACE &kp RIGHT_BRACE &kp PIPE &kp PLUS &kp MINUS ___ ___ &kp EQUAL &kp DELETE // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | # | | $ | ( | ) | ` | | ! | _ | | / | \ | ' | - &kp HASH ___ &kp DOLLAR &kp LEFT_PAREN &kp RIGHT_PAREN &kp GRAVE &kp EXCLAMATION &kp UNDERSCORE ___ &kp SLASH &kp BACKSLASH &kp APOSTROPHE + &kp HASH ___ &kp DOLLAR &kp LPAR &kp RPAR &kp GRAVE &kp EXCLAMATION &kp UNDERSCORE ___ &kp SLASH &kp BACKSLASH &kp APOSTROPHE // |--------------+---------+--------+--------+---------+---------| |-------+---------+---------+---------+----------+----------| // | % | | ^ | [ | ] | ~ | | ? | = | , | < | > | "" | - &kp PERCENT ___ &kp CARET &kp LEFT_BRACKET &kp RIGHT_BRACKET &kp TILDE &kp QUESTION &kp EQUAL &kp COMMA &kp LESS_THAN &kp GREATER_THAN &kp DOUBLE_QUOTE + &kp PERCENT ___ &kp CARET &kp LEFT_BRACKET &kp RIGHT_BRACKET &kp TILDE &kp QUESTION &kp EQUAL &kp COMMA &kp LESS_THAN &kp GREATER_THAN &kp DQT // '---------------------------------+--------+---------+---------+ |-------+---------+---------+-------------------------------' // | | | | | | | | ___ &mo 4 ___ ___ ___ ___