From 045545c7c5177e0d11c9fe4daa2b516f99fb5b72 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sun, 14 Jan 2024 10:37:13 -0500 Subject: Update keymap --- config/base.keymap | 205 +++++++++++++++++++++++---------------------- config/corneish_zen.conf | 14 ++-- config/corneish_zen.keymap | 2 + 3 files changed, 114 insertions(+), 107 deletions(-) diff --git a/config/base.keymap b/config/base.keymap index 00fa14c..353a0dd 100644 --- a/config/base.keymap +++ b/config/base.keymap @@ -34,108 +34,105 @@ / { behaviors { hm_left: homerow_modifiers_left { - label = "hm_left"; compatible = "zmk,behavior-hold-tap"; flavor = "balanced"; #binding-cells = <2>; tapping-term-ms = <280>; quick-tap-ms = <175>; - global-quick-tap-ms = <150>; + require-prior-idle-ms = <150>; bindings = <&kp>, <&kp>; hold-trigger-key-positions = ; hold-trigger-on-release; }; hm_right: homerow_modifiers_right { - label = "hmod_right"; compatible = "zmk,behavior-hold-tap"; flavor = "balanced"; #binding-cells = <2>; tapping-term-ms = <280>; quick-tap-ms = <175>; - global-quick-tap-ms = <150>; + require-prior-idle-ms = <150>; bindings = <&kp>, <&kp>; hold-trigger-key-positions = ; hold-trigger-on-release; }; layer_mo: layer_modifiers { - label = "layermod"; compatible = "zmk,behavior-hold-tap"; flavor = "balanced"; #binding-cells = <2>; tapping-term-ms = <280>; quick-tap-ms = <175>; - global-quick-tap-ms = <150>; + require-prior-idle-ms = <150>; bindings = <&mo>, <&kp>; hold-trigger-on-release; }; }; - combos { - compatible = "zmk,combos"; + /* combos { */ + /* compatible = "zmk,combos"; */ - combo_q_c_x { - timeout-ms = ; - global-quick-tap-ms = <100>; - key-positions = ; - layers = ; - bindings = <&hm_left LS(LCTRL) LC(B)>; - }; + /* combo_q_c_x { */ + /* timeout-ms = ; */ + /* require-prior-idle-ms = <100>; */ + /* key-positions = ; */ + /* layers = ; */ + /* bindings = <&hm_left LS(LCTRL) LC(B)>; */ + /* }; */ - combo_q_c_c { - timeout-ms = ; - global-quick-tap-ms = <100>; - key-positions = ; - layers = ; - bindings = <&hm_left LA(LCTRL) LC(I)>; - }; + /* combo_q_c_c { */ + /* timeout-ms = ; */ + /* require-prior-idle-ms = <100>; */ + /* key-positions = ; */ + /* layers = ; */ + /* bindings = <&hm_left LA(LCTRL) LC(I)>; */ + /* }; */ - combo_d_c_x { - timeout-ms = ; - global-quick-tap-ms = <100>; - key-positions = ; - layers = ; - bindings = <&hm_left LS(LCTRL) LC(X)>; - }; + /* combo_d_c_x { */ + /* timeout-ms = ; */ + /* require-prior-idle-ms = <100>; */ + /* key-positions = ; */ + /* layers = ; */ + /* bindings = <&hm_left LS(LCTRL) LC(X)>; */ + /* }; */ - combo_d_c_c { - timeout-ms = ; - global-quick-tap-ms = <100>; - key-positions = ; - layers = ; - bindings = <&hm_left LA(LCTRL) LC(C)>; - }; + /* combo_d_c_c { */ + /* timeout-ms = ; */ + /* require-prior-idle-ms = <100>; */ + /* key-positions = ; */ + /* layers = ; */ + /* bindings = <&hm_left LA(LCTRL) LC(C)>; */ + /* }; */ - combo_tab { - timeout-ms = ; - global-quick-tap-ms = <100>; - key-positions = ; - layers = ; - bindings = <&kp TAB>; - }; + /* combo_tab { */ + /* timeout-ms = ; */ + /* require-prior-idle-ms = <100>; */ + /* key-positions = ; */ + /* layers = ; */ + /* bindings = <&kp TAB>; */ + /* }; */ - combo_ret { - timeout-ms = ; - global-quick-tap-ms = <100>; - key-positions = ; - layers = ; - bindings = <&hm_right LS(LCTRL) RET>; - }; + /* combo_ret { */ + /* timeout-ms = ; */ + /* require-prior-idle-ms = <100>; */ + /* key-positions = ; */ + /* layers = ; */ + /* bindings = <&hm_right LS(LCTRL) RET>; */ + /* }; */ - combo_bspc { - timeout-ms = ; - global-quick-tap-ms = <100>; - key-positions = ; - layers = ; - bindings = <&kp BSPC>; - }; - combo_del { - timeout-ms = ; - global-quick-tap-ms = <100>; - key-positions = ; - layers = ; - bindings = <&kp DEL>; - }; - }; + /* combo_bspc { */ + /* timeout-ms = ; */ + /* require-prior-idle-ms = <100>; */ + /* key-positions = ; */ + /* layers = ; */ + /* bindings = <&kp BSPC>; */ + /* }; */ + /* combo_del { */ + /* timeout-ms = ; */ + /* require-prior-idle-ms = <100>; */ + /* key-positions = ; */ + /* layers = ; */ + /* bindings = <&kp DEL>; */ + /* }; */ + /* } ; */ conditional_layers { compatible = "zmk,conditional-layers"; @@ -157,63 +154,65 @@ compatible = "zmk,keymap"; default_layer { - label = "DVORAK"; + display-name = "DVORAK"; // DV - Dvorak layer bindings = < R1X &kp SQT &kp COMMA &kp DOT &kp P &kp Y R1Y &kp F &kp G &kp C &kp R &kp L R1Z R2X &HL1(A) &HL2(O) &HL3(E) &HL4(U) &kp I R2Y &kp D &HR4(H) &HR3(T) &HR2(N) &HR1(S) R2Z R3X &kp SEMI &kp Q &kp J &kp K &kp X R3Y &kp B &kp M &kp W &kp V &kp Z R3Z - R4X &kp LSHIFT &mo LOW SPACEKEY R4Y TX &mo UPR &kp LSHIFT R4Z + R4X &mo LOW &kp LSHIFT R4Y SPACEKEY &mo UPR R4Z >; }; dvorak_layer { - label = "QWERTY"; + display-name = "QWERTY"; // This is a "QWERTY" keymap, but it's really intended to be used in dvorak mode // (with setxkbmap us -variant dvorak -option compose:ralt). bindings = < - R1X &kp Q &kp W &kp E &kp R &kp T R1Y &kp Y &kp U &kp I &kp O &kp P R1Z - R2X &HL1(A) &HL2(S) &HL3(D) &HL4(F) &kp G R2Y &kp H &HR4(J) &HR3(K) &HR2(L) &HR1(SEMI) R2Z - R3X &kp Z &kp X &kp C &kp V &kp B R3Y &kp N &kp M &kp COMMA &kp DOT &kp SLASH R3Z - R4X &kp LSHIFT &mo LOW SPACEKEY R4Y TX &mo UPR &kp LSHIFT R4Z + R1X &kp Q &kp W &kp E &kp R &kp T R1Y &kp Y &kp U &kp I &kp O &kp P R1Z + R2X &HL1(A) &HL2(S) &HL3(D) &HL4(F) &kp G R2Y &kp H &HR4(J) &HR3(K) &HR2(L) &HR1(SEMI) R2Z + R3X &kp Z &kp X &kp C &kp V &kp B R3Y &kp N &kp M &kp COMMA &kp DOT &kp SLASH R3Z + R4X &mo LOW &kp LSHIFT R4Y SPACEKEY &mo UPR R4Z >; }; gaming_layer { - label = "GAMING"; + display-name = "GAMING"; bindings = < - R1X &kp Q &kp W &kp E &kp R &kp T R1Y &kp Y &kp U &kp I &kp O &kp P R1Z - R2X &kp A &kp S &kp D &kp F &kp G R2Y &kp H &kp J &kp K &kp L &kp SEMI R2Z - R3X &kp Z &kp X &kp C &kp V &kp B R3Y &kp N &kp M &kp COMMA &kp DOT &kp SLASH R3Z - - R4X SPACEKEY &mo UPR &kp LSHIFT R4Y TX &mo LOW R4Z + R1X &kp Q &kp W &kp E &kp R &kp T R1Y &kp Y &kp U &kp I &kp O &kp P R1Z + R2X &kp A &kp S &kp D &kp F &kp G R2Y &kp H &kp J &kp K &kp L &kp SEMI R2Z + R3X &kp Z &kp X &kp C &kp V &kp B R3Y &kp N &kp M &kp COMMA &kp DOT &kp SLASH R3Z + R4X &mo LOW &kp LSHIFT R4Y SPACEKEY &mo UPR R4Z >; }; lower_layer { + display-name = "lower"; bindings = < - R1X &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT R1Y &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR R1Z - R2X &kp LGUI &kp LALT &kp LCTL &kp LSHFT &kp BSLH R2Y &kp FSLH &kp UNDER &kp PLUS &kp LBRC &kp RBRC R2Z - R3X &kp GRAVE &kp TILDE &kp TAB &kp ESC &kp PIPE R3Y &kp QMARK &kp MINUS &kp EQUAL &kp LBKT &kp RBKT R3Z - R4X &trans &trans SPACEKEY R4Y TX &trans &trans R4Z + R1X &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT R1Y &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR R1Z + R2X &kp LGUI &kp LALT &kp LCTL &kp LSHFT &kp BSLH R2Y &kp FSLH &kp UNDER &kp PLUS &kp LBRC &kp RBRC R2Z + R3X &kp GRAVE &kp TILDE &kp TAB &kp ESC &kp PIPE R3Y &kp QMARK &kp MINUS &kp EQUAL &kp LBKT &kp RBKT R3Z + R4X &trans &trans SPACEKEY R4Y &trans &trans R4Z >; }; raise_layer { + display-name = "raise"; bindings = < - R1X &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 R1Y &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 R1Z - R2X &trans &trans &trans &trans &trans R2Y &kp BSPC &kp LSHFT &kp LCTL &kp LALT &kp LGUI R2Z - R3X &trans &trans &trans &trans &trans R3Y &kp RALT &kp RET &kp DEL &trans &trans R3Z + R1X &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 R1Y &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 R1Z + R2X &trans &trans &trans &trans &trans R2Y &kp BSPC &kp LSHFT &kp LCTL &kp LALT &kp LGUI R2Z + R3X &trans &trans &trans &trans &trans R3Y &kp RALT &kp RET &kp DEL &trans &trans R3Z - R4X &trans &trans SPACEKEY R4Y TX &trans &trans R4Z + R4X &trans &trans SPACEKEY R4Y TX &trans &trans R4Z >; }; navigation_layer { + display-name = "nav"; bindings = < - R1X &mkp MB4 &mkp MB3 &mkp MB2 &mkp MB1 &trans R1Y &trans &trans &trans &trans &trans R1Z - R2X &trans &trans &trans &trans &trans R2Y &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT R2Z - R3X &trans &trans &trans &trans &trans R3Y &trans &kp HOME &kp PG_DN &kp PG_UP &kp END R3Z + R1X &mkp MB4 &mkp MB3 &mkp MB2 &mkp MB1 &trans R1Y &trans &trans &trans &trans &trans R1Z + R2X &trans &trans &trans &trans &trans R2Y &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT R2Z + R3X &trans &trans &trans &trans &trans R3Y &trans &kp HOME &kp PG_DN &kp PG_UP &kp END R3Z R4X &trans &trans SPACEKEY R4Y TX &trans &trans R4Z >; @@ -222,39 +221,43 @@ mouse_layer { // Waiting for https://github.com/zmkfirmware/zmk/pull/778 // Using fork at https://github.com/ftc/zmk/blob/mouse-ftc + display-name = "mouse"; bindings = < - R1X &trans &trans &trans &trans &trans R1Y &trans &trans &trans &trans &trans R1Z - R2X &mkp MB4 &mkp MB3 &mkp MB2 &mkp MB1 &trans R2Y &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT R2Z - R3X &trans &trans &trans &trans &trans R3Y &trans &trans &trans &trans &trans R3Z + R1X &trans &trans &trans &trans &trans R1Y &trans &trans &trans &trans &trans R1Z + R2X &mkp MB4 &mkp MB3 &mkp MB2 &mkp MB1 &trans R2Y &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT R2Z + R3X &trans &trans &trans &trans &trans R3Y &trans &trans &trans &trans &trans R3Z R4X &trans &trans SPACEKEY R4Y TX &trans &trans R4Z >; }; qwerty_lower_layer { + display-name = "lower"; bindings = < - R1X &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT R1Y &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR R1Z - R2X &kp LGUI &kp LALT &kp LCTL &kp LSHFT &kp BSLH R2Y &kp LBKT &kp DQT &kp RBRC &kp UNDER &kp PLUS R2Z - R3X &kp GRAVE &kp TILDE &kp TAB &kp ESC &kp PIPE R3Y &kp LBRC &kp SQT &kp RBKT &kp MINUS &kp EQUAL R3Z + R1X &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT R1Y &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR R1Z + R2X &kp LGUI &kp LALT &kp LCTL &kp LSHFT &kp BSLH R2Y &kp LBKT &kp DQT &kp RBRC &kp UNDER &kp PLUS R2Z + R3X &kp GRAVE &kp TILDE &kp TAB &kp ESC &kp PIPE R3Y &kp LBRC &kp SQT &kp RBKT &kp MINUS &kp EQUAL R3Z R4X &trans &trans SPACEKEY R4Y TX &trans &trans R4Z >; }; gaming_lower_layer { + display-name = "gaming"; bindings = < - R1X &kp N1 &kp N2 &kp N3 &kp N4 &kp N9 R1Y &trans &trans &trans &trans &trans R1Z - R2X &kp N5 &kp N6 &kp N7 &kp N8 &kp N0 R2Y &trans &trans &trans &trans &trans R2Z - R3X &trans &trans &trans &trans &trans R3Y &trans &trans &trans &trans &trans R3Z + R1X &kp N1 &kp N2 &kp N3 &kp N4 &kp N9 R1Y &trans &trans &trans &trans &trans R1Z + R2X &kp N5 &kp N6 &kp N7 &kp N8 &kp N0 R2Y &trans &trans &trans &trans &trans R2Z + R3X &trans &trans &trans &trans &trans R3Y &trans &trans &trans &trans &trans R3Z R4X &trans &trans SPACEKEY R4Y TX &trans &trans R4Z >; }; function_layer { + display-name = "fn"; bindings = < - R1X &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 R1Y &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 R1Z - R2X &kp F11 &kp F12 &to GAMING &to DV &to QW R2Y &trans &trans &trans &trans &trans R2Z + R1X &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 R1Y &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 R1Z + R2X &kp F11 &kp F12 &to GAMING &to DV &to QW R2Y &trans &trans &trans &trans &trans R2Z R3X FUNC_KEYS R3Z - R4X &trans &trans SPACEKEY R3Y TX &trans &trans R4Z + R4X &trans &trans SPACEKEY R4Y TX &trans &trans R4Z >; }; diff --git a/config/corneish_zen.conf b/config/corneish_zen.conf index f34ae05..213f82f 100644 --- a/config/corneish_zen.conf +++ b/config/corneish_zen.conf @@ -1,5 +1,5 @@ # Set sleep timeout to 30min (30*60*1000ms) -CONFIG_ZMK_SLEEP=y +#CONFIG_ZMK_SLEEP=y CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000 # Zen display tweaks, requires patches by caksoylar @@ -7,20 +7,22 @@ CONFIG_ZMK_DISPLAY_FULL_REFRESH_PERIOD=300 CONFIG_ZMK_DISPLAY_HIDE_MOMENTARY_LAYERS=y CONFIG_CUSTOM_WIDGET_LAYER_STATUS_HIDE_HEADING=y -# Mouse config, requires PR #778 +# Better partial refresh +CONFIG_IL0323_ALTERNATIVE_REFRESH=y + CONFIG_ZMK_MOUSE=y -CONFIG_ZMK_MOUSE_TICK_DURATION=8 +#CONFIG_ZMK_MOUSE_TICK_DURATION=8 # Combo config, automated by build script -CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6 +#CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=6 CONFIG_ZMK_COMBO_MAX_KEYS_PER_COMBO=3 # Windows battery reporting fix # CONFIG_BT_GATT_ENFORCE_SUBSCRIPTION=n # Clear all bluetooth bonds on start up -# CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=y +CONFIG_ZMK_BLE_CLEAR_BONDS_ON_START=n # Turn on logging # CONFIG_ZMK_USB_LOGGING=y -# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000 \ No newline at end of file +# CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000 diff --git a/config/corneish_zen.keymap b/config/corneish_zen.keymap index 2dea08f..82ba4d3 100644 --- a/config/corneish_zen.keymap +++ b/config/corneish_zen.keymap @@ -12,5 +12,7 @@ #define LEFT_KEYS LT0 LT1 LT2 LT3 LT4 LM0 LM1 LM2 LM3 LM4 LB0 LB1 LB2 LB3 LB4 #define RIGHT_KEYS RT0 RT1 RT2 RT3 RT4 RM0 RM1 RM2 RM3 RM4 RB0 RB1 RB2 RB3 RB4 #define THUMBS LH0 LH1 LH2 RH0 RH1 RH2 +#define R4X &none +#define R4Z &none #include "base.keymap" -- cgit v1.2.3