summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/corne.keymap41
-rw-r--r--config/corne_right.conf2
-rw-r--r--config/includes/combos.dtsi.old183
-rw-r--r--config/includes/common.h (renamed from config/utils/common.h)18
-rw-r--r--config/includes/homerow.h (renamed from config/utils/homerow.h)0
-rw-r--r--config/includes/keypos_42keys.h (renamed from config/utils/keypos_42keys.h)0
-rw-r--r--config/includes/mouse_tp.dtsi4
-rw-r--r--config/includes/unicode.h (renamed from config/utils/unicode.h)0
8 files changed, 45 insertions, 203 deletions
diff --git a/config/corne.keymap b/config/corne.keymap
index 9922b2b..aca34a6 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 "includes/keypos_42keys.h"
#define K_E LT2
#define K_O RT3
@@ -21,8 +21,9 @@
#define RAISE 2
#define SUPER 3
#define MOUSE_TP 4
+#define MOUSE 5
-#include "utils/common.h"
+#include "includes/common.h"
#define HAS_MOUSE_KEYS
#define HAS_MOUSE_TP
@@ -59,10 +60,10 @@ COMBO(lnx_ao_comb, K_A K_O, DEFAULT, &lnx_no_ao)
// | 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
+ XXX &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &tog MOUSE
&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 &mo SUPER
- &mt LCTRL TAB &kp_mo RAISE RET &kp LSHIFT &kp_mt LSHIFT BSPC &kp_mo LOWER SPACE &mt LCTRL ESC
+ &mt LCTRL TAB &kp_mo_hold RAISE RET &kp LSHIFT &kp_mt LSHIFT BSPC &kp_mo_tap LOWER SPACE &mt LCTRL ESC
>;
};
lower_layer {
@@ -73,9 +74,9 @@ COMBO(lnx_ao_comb, K_A K_O, DEFAULT, &lnx_no_ao)
// | | | | | | | |
label = "Lower";
bindings = <
- &kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC
- ___ ___ ___ ___ ___ ___ &kp LEFT &kp DOWN &kp UP &kp RIGHT ___ ___
- &kp LGUI ___ ___ ___ ___ ___ &kp HOME &kp PG_DN &kp PG_UP &kp END ___ ___
+ &kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC
+ ___ ___ ___ &msc SCRL_UP &msc SCRL_DOWN ___ &kp LEFT &kp DOWN &kp UP &kp RIGHT ___ ___
+ &kp LGUI ___ ___ ___ ___ ___ &kp HOME &kp PG_DN &kp PG_UP &kp END ___ ___
___ ___ ___ ___ ___ ___
>;
};
@@ -101,9 +102,9 @@ COMBO(lnx_ao_comb, K_A K_O, DEFAULT, &lnx_no_ao)
// | | | | | | | |
label = "Super";
bindings = <
- &out OUT_TOG ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
+ &out OUT_TOG ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
&bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 ___ &kp C_VOL_DN &kp C_VOL_UP &kp C_MUTE ___ ___
- ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
+ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
___ ___ ___ ___ ___ ___
>;
};
@@ -115,10 +116,24 @@ COMBO(lnx_ao_comb, K_A K_O, DEFAULT, &lnx_no_ao)
// | | | | | | | |
label = "TP";
bindings = <
- ___ ___ ___ ___ ___ &mms MS_TP_SENSITIVITY_INCR &mkp RCLK ___ ___ ___ ___ ___
- ___ ___ ___ ___ ___ &mms MS_TP_SENSITIVITY_DECR ___ ___ ___ ___ ___ ___
- ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
- ___ ___ ___ &mkp LCLK &mkp MCLK ___
+ ___ ___ ___ ___ ___ ___ &mkp MCLK &mkp RCLK ___ ___ ___ ___
+ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
+ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___ ___
+ ___ ___ ___ &mkp LCLK ___ ___
+ >;
+ };
+ MOUSE {
+// ----------------------------------------------------------------------------------------
+// | | | | | | | | | | | | | |
+// | | | | | | | | | | | | | |
+// | | | | | | | | | | | | | |
+// | | | | | | | |
+ label = "Mouse";
+ bindings = <
+ ___ ___ ___ ___ ___ &mms MS_TP_SENSITIVITY_INCR &mkp MCLK &mkp RCLK ___ ___ ___ ___
+ ___ ___ ___ ___ ___ &mms MS_TP_SENSITIVITY_DECR &msc SCRL_UP ___ ___ ___ ___ ___
+ ___ ___ ___ ___ ___ ___ &msc SCRL_DOWN ___ ___ ___ ___ ___
+ ___ ___ ___ &mkp LCLK ___ ___
>;
};
};
diff --git a/config/corne_right.conf b/config/corne_right.conf
index 1f2c6f7..9a282bd 100644
--- a/config/corne_right.conf
+++ b/config/corne_right.conf
@@ -1,2 +1,2 @@
CONFIG_ZMK_SPLIT_ROLE_CENTRAL=y
-CONFIG_ZMK_USB_LOGGING=n
+CONFIG_ZMK_USB_LOGGING=y
diff --git a/config/includes/combos.dtsi.old b/config/includes/combos.dtsi.old
deleted file mode 100644
index f24cffb..0000000
--- a/config/includes/combos.dtsi.old
+++ /dev/null
@@ -1,183 +0,0 @@
-#define COMBO_TERM_FAST 35
-#define COMBO_TERM_SLOW 40
-#define COMBO_PRIOR_IDLE 100
-
-/ {
- combos {
- compatible = "zmk,combos";
-
- combo_bracket_v_round_l {
- timeout-ms = <COMBO_TERM_FAST>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LT1 LM1>;
- layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
- bindings = <&kp LPAR>;
- };
-
- combo_bracket_v_round_r {
- timeout-ms = <COMBO_TERM_FAST>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <RT1 RM1>;
- layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
- bindings = <&kp RPAR>;
- };
-
- combo_bracket_v_square_l {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LT2 LM2>;
- layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
- bindings = <&kp LBKT>;
- };
-
- combo_bracket_v_square_r {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <RT2 RM2>;
- layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
- bindings = <&kp RBKT>;
- };
-
- combo_bracket_v_curly_l {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LT3 LM3>;
- layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
- bindings = <&kp LBRC>;
- };
-
- combo_bracket_v_curly_r {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <RT3 RM3>;
- layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
- bindings = <&kp RBRC>;
- };
-
- combo_bracket_v_angled_l {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LM1 LB1>;
- layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
- bindings = <&kp LT>;
- };
-
- combo_bracket_v_angled_r {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <RM1 RB1>;
- layers = <BASE BASE_QWERTY SYM NUM NUM_WORD>;
- bindings = <&kp GT>;
- };
-
- combo_capsword {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LM1 RM1>;
- layers = <BASE BASE_QWERTY>;
-
-#ifdef HAS_CAPSLOCK
- bindings = <&caps_word_capslock >;
-#else
- bindings = <&caps_word>;
-#endif
- };
-
- combo_return {
- timeout-ms = <COMBO_TERM_FAST>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LH2 LH1 LH0>;
- layers = <BASE BASE_QWERTY NAV NUM SYM>;
- bindings = <&kp RET>;
- };
-
- combo_bspc {
- timeout-ms = <COMBO_TERM_FAST>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LH1 LH0>;
- layers = <BASE BASE_QWERTY NAV NUM SYM>;
- bindings = <&kp BSPC>;
- };
-
- // combo_grave {
- // timeout-ms = <COMBO_TERM_SLOW>;
- // require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- // key-positions = <RM3 RM4>;
- // layers = <>;
- // bindings = <&kp GRAVE>;
- // };
-
- // combo_md_code_block {
- // timeout-ms = <COMBO_TERM_SLOW>;
- // require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- // key-positions = <RM2 RM3 RM4>;
- // layers = <>;
- // bindings = <&m_type_md_code_block>;
- // };
-
- combo_tog_nav_word {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LM3 LM2 LM1>;
- layers = <BASE BASE_QWERTY NUM NUM_WORD>;
-
- #ifdef HAS_UROB
- bindings = <&nav_word>;
- #else
- bindings = <&tog NAV_WORD>;
- #endif
-
- };
-
- combo_tog_num_word {
- timeout-ms = <COMBO_TERM_SLOW>;
- require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LB3 LB2 LB1>;
- layers = <BASE BASE_QWERTY NAV NAV_WORD>;
-
- #ifdef HAS_UROB
- bindings = <&num_word>;
- #else
- bindings = <&tog NUM_WORD>;
- #endif
-
- };
-
-#ifdef HAS_MOUSE_TP
- combo_tog_mouse_settings_l {
- timeout-ms = <COMBO_TERM_SLOW>;
- // require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LT2 LT3 LT4>;
- layers = <BASE BASE_QWERTY NAV NAV_WORD MOUSE_KEYS>;
- bindings = <&tog MOUSE_SET>;
- };
-
- combo_tog_mouse_settings_r {
- timeout-ms = <COMBO_TERM_SLOW>;
- // require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <RT2 RT3 RT4>;
- layers = <BASE BASE_QWERTY NAV NAV_WORD MOUSE_KEYS>;
- bindings = <&tog MOUSE_SET>;
- };
-#endif
-
-#ifdef HAS_MOUSE_KEYS
- combo_tog_mouse_keys_l {
- timeout-ms = <COMBO_TERM_SLOW>;
- // require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <LM2 LM3 LM4>;
- layers = <BASE BASE_QWERTY NAV NAV_WORD MOUSE_KEYS>;
- bindings = <&tog MOUSE_KEYS>;
- };
-
- combo_tog_mouse_keys_r {
- timeout-ms = <COMBO_TERM_SLOW>;
- // require-prior-idle-ms = <COMBO_PRIOR_IDLE>;
- key-positions = <RM2 RM3 RM4>;
- layers = <BASE BASE_QWERTY NAV NAV_WORD MOUSE_KEYS>;
- bindings = <&tog MOUSE_KEYS>;
- };
-#endif
-
- };
-};
diff --git a/config/utils/common.h b/config/includes/common.h
index 57ee0d0..79528c8 100644
--- a/config/utils/common.h
+++ b/config/includes/common.h
@@ -2,7 +2,7 @@
#define XXX &none
#ifndef QUICK_TAP_MS
- #define QUICK_TAP_MS 172
+ #define QUICK_TAP_MS 162
#endif
#define ZMK_HELPER_STRINGIFY(x) #x
@@ -28,14 +28,24 @@
// Some general behaviours that are slightly tweaked from the core
/ {
behaviours {
- kp_mo: behavior_kp_mo {
+ kp_mo_tap: behavior_kp_mo_tap {
compatible = "zmk,behavior-hold-tap";
- label = "kp_mo";
+ label = "kp_mo_tap";
#binding-cells = <2>;
flavor = "tap-preferred";
tapping-term-ms = <200>;
quick-tap-ms = <200>;
- require-prior-idle-ms = <140>;
+ //require-prior-idle-ms = <140>;
+ bindings = <&mo>, <&kp>;
+ };
+ kp_mo_hold: behavior_kp_mo_hold {
+ compatible = "zmk,behavior-hold-tap";
+ label = "kp_mo_hold";
+ #binding-cells = <2>;
+ flavor = "hold-preferred";
+ tapping-term-ms = <200>;
+ quick-tap-ms = <200>;
+ //require-prior-idle-ms = <140>;
bindings = <&mo>, <&kp>;
};
kp_mt: behavior_kp_mt {
diff --git a/config/utils/homerow.h b/config/includes/homerow.h
index c8fe06f..c8fe06f 100644
--- a/config/utils/homerow.h
+++ b/config/includes/homerow.h
diff --git a/config/utils/keypos_42keys.h b/config/includes/keypos_42keys.h
index 21f7052..21f7052 100644
--- a/config/utils/keypos_42keys.h
+++ b/config/includes/keypos_42keys.h
diff --git a/config/includes/mouse_tp.dtsi b/config/includes/mouse_tp.dtsi
index 6345cf4..358a5f6 100644
--- a/config/includes/mouse_tp.dtsi
+++ b/config/includes/mouse_tp.dtsi
@@ -94,7 +94,7 @@
// How sensitive the TP is (Default: 128)
- tp-sensitivity = <135>;
+ tp-sensitivity = <205>;
// The maximum mouse movement speed the TP will accelarate to (Default: 97)
@@ -135,7 +135,7 @@
// How long to wait, after the last mouse movement, before deactivating
// the layer (Default: 250)
- layer-toggle-timeout-ms = <1000>;
+ layer-toggle-timeout-ms = <425>;
};
diff --git a/config/utils/unicode.h b/config/includes/unicode.h
index df2b298..df2b298 100644
--- a/config/utils/unicode.h
+++ b/config/includes/unicode.h
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-27 07:42:03 +0000