Fix: remove combos_hook...

.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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "zmk-nodefree-config"]
+	path = zmk-nodefree-config
+	url = https://github.com/urob/zmk-nodefree-config

config/combos.dtsi

@@ -6,70 +6,21 @@
   │ 24  25  26  27  28  29│ │ 30  31  32  33  34  35│
   ╰───────────╮ 36  37  38│ │ 39  40  41╭───────────╯
               ╰───────────╯ ╰───────────╯            */
-compatible = "zmk,combos";
 
-num1 {
+#define COMBO_TERM_FAST 20
-    key-positions = <13 1>;
+#define COMBO_TERM_SLOW 35
-    bindings = <&kt N1>;
-    layers = <0>;
-};
 
-num2 {
+ZMK_COMBO(num1, &kp N1, 13 1,  DEF, COMBO_TERM_FAST)
-    key-positions = <14 2>;
+ZMK_COMBO(num2, &kp N2, 14 2,  DEF, COMBO_TERM_FAST)
-    bindings = <&kt N2>;
+ZMK_COMBO(num3, &kp N3, 15 3,  DEF, COMBO_TERM_FAST)
-    layers = <0>;
+ZMK_COMBO(num4, &kp N4, 16 4,  DEF, COMBO_TERM_FAST)
-};
+ZMK_COMBO(num5, &kp N5, 17 5,  DEF, COMBO_TERM_FAST)
+ZMK_COMBO(num6, &kp N6, 18 6,  DEF, COMBO_TERM_FAST)
+ZMK_COMBO(num7, &kp N7, 19 7,  DEF, COMBO_TERM_FAST)
+ZMK_COMBO(num8, &kp N8, 20 8,  DEF, COMBO_TERM_FAST)
+ZMK_COMBO(num9, &kp N9, 21 9,  DEF, COMBO_TERM_FAST)
+ZMK_COMBO(num0, &kp N0, 22 10, DEF, COMBO_TERM_FAST)
 
-num3 {
+ZMK_COMBO(esc, &kp ESC, 15 16, DEF, COMBO_TERM_FAST)
-    key-positions = <15 3>;
+ZMK_COMBO(ret, &kp RET, 19 20, DEF, COMBO_TERM_FAST)
-    bindings = <&kt N3>;
-    layers = <0>;
-};
 
-num4 {
-    key-positions = <16 4>;
-    bindings = <&kt N4>;
-    layers = <0>;
-};
-
-num5 {
-    key-positions = <17 5>;
-    bindings = <&kt N5>;
-    layers = <0>;
-};
-
-num6 {
-    key-positions = <18 6>;
-    bindings = <&kt N6>;
-    layers = <0>;
-};
-
-num7 {
-    key-positions = <19 7>;
-    bindings = <&kt N7>;
-    layers = <0>;
-};
-
-num8 {
-    key-positions = <20 8>;
-    bindings = <&kt N8>;
-    layers = <0>;
-};
-
-num9 {
-    key-positions = <21 9>;
-    bindings = <&kt N9>;
-    layers = <0>;
-};
-
-num0 {
-    key-positions = <22 10>;
-    bindings = <&kt N0>;
-    layers = <0>;
-};
-
-c_esc {
-    key-positions = <15 16>;
-    bindings = <&kt ESC>;
-    layers = <0>;
-};

config/splitkb_aurora_corne.keymap

@@ -1,89 +1,69 @@
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/keys.h>
+#include "../zmk-nodefree-config/helper.h"
 
-#define DEFAULT 0
+#define DEF 0
-#define RIGHT_   1
+#define RHAND   1
-#define LEFT_    2
+#define LHAND    2
-#define SHEET_   3
+#define SHEET   3
 
-/ {
+// homerow mods
-    behaviors {
+ZMK_BEHAVIOR(hm, hold_tap,
-        hm: homerow_mods {
-            compatible = "zmk,behavior-hold-tap";
-            label = "HOMEROW_MODS";
-            #binding-cells = <2>;
-            tapping-term-ms = <200>;
-            quick-tap-ms = <0>;
     flavor = "balanced";
+    tapping-term-ms = <200>;
+    quick-tap-ms = <125>;
     bindings = <&kp>, <&kp>;
-        };
+)
-
-    combos {
 #include "combos.dtsi"
-    };
 
-    keymap {
+ZMK_LAYER(default_layer,
-        compatible = "zmk,keymap";
-
-        default_layer {
             // -----------------------------------------------------------------------------------------
             // | [ |  Q  |  W  |  E  |  R  |  T  |   |  Y  |  U   |  I  |  O  |  P  | ] |
             // | \ |  A  |  S  |  D  |  F  |  G  |   |  H  |  J   |  K  |  L  |  ;  |  '   |
             // | < |  Z  |  X  |  C  |  V  |  B  |   |  N  |  M   |  ,  |  .  |  /  | =  |
             //                 | TAB | RET | ESC |   | BKSP | SP  | TAB |
 
-            bindings = <
 &kp LBKT  &kp Q       &kp W       &kp E           &kp R        &kp T      &kp Y     &kp U        &kp I          &kp O       &kp P          &kp RBKT
 &kp BSLH  &hm LGUI A  &hm RALT S  &hm LCTRL D     &hm LSHFT F  &kp G      &kp H     &hm RSHFT J  &hm RCTRL K    &hm RALT L  &hm RGUI SEMI  &kp SQT
 &kp NUBS   &kp Z       &kp X       &kp C           &kp V        &kp B      &kp N     &kp M        &kp COMMA      &kp DOT     &kp FSLH       &kp EQUAL
-                                  &lt RIGHT_ TAB  &kp RET      &kp ESC    &kp BSPC  &kp SPACE    &lt LEFT_ TAB
+                                  &lt RHAND TAB  &kp RET      &kp ESC    &kp BSPC  &kp SPACE    &lt LHAND TAB
-            >;
+        )
-        };
 
-        right_layer {
+ZMK_LAYER(right_layer,
             // -----------------------------------------------------------------------------------------
             // | BTCLR |     |  mute | vold | volu | printS  |    |  6    |  7  |  8  |  9   |  0   | -    |
             // | BT1  | LGUI | RALT | LCTRL | LSHFT |        |    |  LFT  | DWN |  UP | RGT  |      |      |
             // | BT2  |     |     |     |     |     |        |    |  F7   | F8  |  F9 | F10  |  F11 | F12  |
-            //                             |     |     |     |    | DEL | SPACE | tog SHEET_ |
+            //                             |     |     |     |    | DEL | SPACE | tog SHEET |
-
-            bindings = <
 &bt BT_CLR    &trans    &kp C_MUTE  &kp C_VOL_DN  &kp C_VOL_UP  &kp PSCRN    &kp N6    &kp N7     &kp N8       &kp N9     &kp N0   &kp BSPC
 &bt BT_SEL 1  &kp LGUI  &kp RALT    &kp LCTRL     &kp LSHFT     &none        &kp LEFT  &kp DOWN   &kp UP       &kp RIGHT  &none    &none
 &bt BT_SEL 2  &none     &none       &none         &none         &none        &kp F7    &kp F8     &kp F9       &kp F10    &kp F11  &kp F12
-                                    &trans        &trans        &trans       &kp DEL   &kp SPACE  &tog SHEET_
+                                    &trans        &trans        &trans       &kp DEL   &kp SPACE  &tog SHEET
-            >;
+            )
-        };
 
-        left_layer {
+ZMK_LAYER(left_layer,
             // -----------------------------------------------------------------------------------------
             // |  GRAVE |  1  |  2  |  3  |  4  |  5  |     |    |         |         |        |        | BT3  |
             // |        | \   | {   | [   | ]   | }   |     |    | RSHFT   |  RCTRL  | RALT   |  RGUI  | BT4  |
             // |  F1    |  F2 | F3  |  F4 | F5  | F6  |     |    |         |         |        |        | BT5  |
-            //                      | tog SHEET_  |     |     |    |         |         |        |
+            //                      | tog SHEET  |     |     |    |         |         |        |
 
-            bindings = <
 &kp TAB     &kp N1      &kp N2      &kp N3      &kp N4         &kp N5           &none      &none      &none     &none     &none  &bt BT_SEL 3
 &kp LA(N6)  &kp LA(N8)  &kp LA(N4)  &kp LA(N5)  &kp LA(MINUS)  &kp LA(EQUAL)    &kp RSHFT  &kp RCTRL  &kp RALT  &kp RGUI  &none  &bt BT_SEL 4
 &kp F1      &kp F2      &kp F3      &kp F4      &kp F5         &kp F6           &none      &none      &none     &none     &none  &bt BT_SEL 5
-                                    &to SHEET_  &none          &none            &none      &none      &trans
+                                    &to SHEET  &none          &none            &none      &none      &trans
-            >;
+            )
-        };
 
-        sheet_layer {
+ZMK_LAYER(sheet_layer,
             // -----------------------------------------------------------------------------------------
             // | BSPC  |  + |  7  |  8  |  9  |  -  |   |     |     |     |     |     |      |
             // |  DEL  |  ( |  4  |  5  |  6  |  *  |   | LFT | DWN |  UP | RGT |     |      |
             // | NLoc  |  ) |  1  |  2  |  3  |  /  |   |     |     |     |     |     |      |
-            //                    |  0  |  .  | ENT |   | BSPC | SPACE | Tog SHEET_ |
+            //                    |  0  |  .  | ENT |   | BSPC | SPACE | Tog SHEET |
 
-            bindings = <
 &kp BSPC    &kp KP_PLUS  &kp KP_N7  &kp KP_N8  &kp KP_N9   &kp KP_MINUS       &none     &none      &none        &none      &none  &kp C_SLEEP
 &kp DEL     &kp KP_LPAR  &kp KP_N4  &kp KP_N5  &kp KP_N6   &kp KP_MULTIPLY    &kp LEFT  &kp DOWN   &kp UP       &kp RIGHT  &none  &none
 &kp KP_NUM  &kp KP_RPAR  &kp KP_N1  &kp KP_N2  &kp KP_N3   &kp KP_DIVIDE      &none     &none      &none        &none      &none  &none
-                                    &kp KP_N0  &kp KP_DOT  &kp RET            &kp BSPC  &kp SPACE  &tog SHEET_
+                                    &kp KP_N0  &kp KP_DOT  &kp RET            &kp BSPC  &kp SPACE  &tog SHEET
-            >;
+            )
-        };
-    };
-};

zmk-nodefree-config

@@ -0,0 +1 @@
+Subproject commit 4bdd8e85dca9ee1c817065bba4a70a7e1fd78eae