Improve tapping term and some thumb keys, move utils inside config

6 files changed, 16 insertions, 21 deletions

diff --git a/config/bt60_v2.keymap b/config/bt60_v2.keymap
index f7e079d..5ebceef 100644
--- a/config/bt60_v2.keymap
+++ b/config/bt60_v2.keymap
@@ -9,7 +9,7 @@
 #define K_O 23
 #define K_A 28
 
-#include "common.h"
+#include "utils/common.h"
 
 #define DEFAULT 0
 #define RAISE   1
diff --git a/config/corne.keymap b/config/corne.keymap
index a3c2d07..9d3b950 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -10,7 +10,7 @@
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/outputs.h>
 
-#include "../utils/keypos_42keys.h"
+#include "utils/keypos_42keys.h"
 
 #define K_E LT2
 #define K_O RT3
@@ -21,7 +21,7 @@
 #define RAISE   2
 #define SUPER   3
 
-#include "common.h"
+#include "utils/common.h"
 
 COMBO(lnx_oe_comb, K_O K_E, DEFAULT, &lnx_no_oe)
 COMBO(lnx_ae_comb, K_A K_E, DEFAULT, &lnx_no_ae)
@@ -33,40 +33,35 @@ COMBO(lnx_ao_comb, K_A K_O, DEFAULT, &lnx_no_ao)
                 compatible = "zmk,behavior-hold-tap";
                 label = "kp_mo";
                 #binding-cells = <2>;
-                flavor = "hold-preferred";
-                tapping-term-ms = <200>;
+                flavor = "tap-preferred";
+                tapping-term-ms = <QUICK_TAP_MS>;
+                quick-tap-ms = <QUICK_TAP_MS>;
+                require-prior-idle-ms = <100>;
                 bindings = <&mo>, <&kp>;
             };
             td_alt: td_alt {
                 compatible = "zmk,behavior-tap-dance";
                 label = "td_alt";
                 #binding-cells = <0>;
-                tapping-term-ms = <200>;
+                tapping-term-ms = <QUICK_TAP_MS>;
                 bindings = <&kp LALT>, <&kp RALT>;
             };
-            td_esc: td_esc {
-                compatible = "zmk,behavior-tap-dance";
-                label = "td_esc";
-                #binding-cells = <0>;
-                tapping-term-ms = <200>;
-                bindings = <&mt LCTRL ESC>, <&mo SUPER>;
-            };
         };
         keymap {
                 compatible = "zmk,keymap";
 
                 default_layer {
-// ---------------------------------------------------------------------------------------
-// |     |  Q  |  W  |  E  |  R  |    T    |   |    Y    |  U   |  I  |  O  |  P  |      |
-// | ALT |  A  |  S  |  D  |  F  |    G    |   |    H    |  J   |  K  |  L  |  ;  |  '   |
-// | GUI |  Z  |  X  |  C  |  V  |    B    |   |    N    |  M   |  ,  |  .  |  /  |      |
+// ----------------------------------------------------------------------------------------
+// |     |  Q  |  W  |  E  |  R  |    T    |   |    Y    |  U   |  I  |  O  |  P  |       |
+// | ALT |  A  |  S  |  D  |  F  |    G    |   |    H    |  J   |  K  |  L  |  ;  |  '    |
+// | GUI |  Z  |  X  |  C  |  V  |    B    |   |    N    |  M   |  ,  |  .  |  /  | SUPER |
 //                        | TAB |SHIFT| ENT/RSE |   | SPC/LWR | BKSP | CTRL/ESC |
                         label = "Base";
                         bindings = <
    XXX      &kp Q &kp W &kp E &kp R &kp T   &kp Y &kp U  &kp I     &kp O   &kp P    XXX
    &td_alt  &kp A &kp S &kp D &kp F &kp G   &kp H &kp J  &kp K     &kp L   &kp SEMI &kp SQT
-   &kp LGUI &kp Z &kp X &kp C &kp V &kp B   &kp N &kp M  &kp COMMA &kp DOT &kp FSLH XXX
-                      &kp TAB &kp_mo RAISE RET &kp LSHIFT &kp BSPC &kp_mo LOWER SPACE &td_esc
+   &kp LGUI &kp Z &kp X &kp C &kp V &kp B   &kp N &kp M  &kp COMMA &kp DOT &kp FSLH &mo SUPER
+                      &kp TAB &kp_mo RAISE RET &kp LSHIFT &kp BSPC &kp_mo LOWER SPACE &mt LCTRL ESC
                         >;
                 };
                 lower_layer {
diff --git a/config/common.h b/config/utils/common.h
index e656880..babff13 100644
--- a/config/common.h
+++ b/config/utils/common.h
@@ -25,6 +25,6 @@
 };
 
 
-#include "../utils/homerow.h"
-#include "../utils/unicode.h"
+#include "homerow.h"
+#include "unicode.h"
 
diff --git a/utils/homerow.h b/config/utils/homerow.h
index c8fe06f..c8fe06f 100644
--- a/utils/homerow.h
+++ b/config/utils/homerow.h
diff --git a/utils/keypos_42keys.h b/config/utils/keypos_42keys.h
index 21f7052..21f7052 100644
--- a/utils/keypos_42keys.h
+++ b/config/utils/keypos_42keys.h
diff --git a/utils/unicode.h b/config/utils/unicode.h
index df2b298..df2b298 100644
--- a/utils/unicode.h
+++ b/config/utils/unicode.h