diff --git a/config/boards/arm/mriya/mriya_left_defconfig b/config/boards/arm/mriya/mriya_left_defconfig index 4467bee3..b128b2c9 100644 --- a/config/boards/arm/mriya/mriya_left_defconfig +++ b/config/boards/arm/mriya/mriya_left_defconfig @@ -5,7 +5,7 @@ CONFIG_SOC_NRF52840_QIAA=y CONFIG_BOARD_MRIYA_LEFT=y CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT_ROLE_CENTRAL=y -CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_SLEEP=n CONFIG_ZMK_USB=y CONFIG_ZMK_BLE=y @@ -26,4 +26,4 @@ CONFIG_FLASH=y CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y CONFIG_CLOCK_CONTROL_NRF=y -CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y \ No newline at end of file +CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y diff --git a/config/boards/arm/mriya/mriya_right_defconfig b/config/boards/arm/mriya/mriya_right_defconfig index 6d1fda53..3c9d8695 100644 --- a/config/boards/arm/mriya/mriya_right_defconfig +++ b/config/boards/arm/mriya/mriya_right_defconfig @@ -4,7 +4,7 @@ CONFIG_SOC_SERIES_NRF52X=y CONFIG_SOC_NRF52840_QIAA=y CONFIG_BOARD_MRIYA_RIGHT=y CONFIG_ZMK_SPLIT=y -CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_SLEEP=n CONFIG_ZMK_USB=y CONFIG_ZMK_BLE=y @@ -23,4 +23,4 @@ CONFIG_SETTINGS_NVS=y CONFIG_FLASH=y CONFIG_FLASH_PAGE_LAYOUT=y CONFIG_FLASH_MAP=y -CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y \ No newline at end of file +CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y diff --git a/config/mriya.keymap b/config/mriya.keymap index 858b6679..564092b9 100644 --- a/config/mriya.keymap +++ b/config/mriya.keymap @@ -5,8 +5,8 @@ */ #include -#include #include +#include #define DEF 0 #define LWR 1 @@ -15,49 +15,143 @@ < { quick_tap_ms = <200>; + tapping-term-ms = <140>; }; &mt { - quick_tap_ms = <200>; + quick_tap_ms = <15>; + tapping-term-ms = <150>; }; / { + combos { + compatible = "zmk,combos"; + + firefox { + bindings = <&kp LS(LA(LC(NUMBER_1)))>; + key-positions = <15 16 17>; + }; + + delete { + bindings = <&kp DEL>; + key-positions = <4 17>; + }; + + minusexcel { + bindings = <&kp LC(MINUS)>; + key-positions = <1 2>; + }; + + minusgoogkle { + bindings = <&MinusG>; + key-positions = <0 1>; + }; + + space { + bindings = <&kp SPACE>; + key-positions = <3 5>; + }; + + UPUI { + bindings = <&kp PAGE_UP>; + key-positions = <2 3 4>; + }; + + DOWNj { + bindings = <&kp PAGE_DOWN>; + key-positions = <14 15 16>; + }; + + DelWord { + bindings = <&kp LC(BACKSPACE)>; + key-positions = <6 7 8>; + }; + + BS { + bindings = <&kp BACKSPACE>; + key-positions = <15 17>; + }; + }; + + behaviors { + dot: dot { + compatible = "zmk,behavior-tap-dance"; + label = "DOT"; + #binding-cells = <0>; + bindings = <&kp DOT>, <&kp LS(SLASH)>, <&kp COMMA>; + + tapping-term-ms = <250>; + }; + }; + + macros { + langswtich2: langswtich2 { + compatible = "zmk,behavior-macro"; + #binding-cells = <0>; + bindings = + <¯o_press>, + <&kp LEFT_ALT>, + <¯o_tap>, + <&kp LEFT_SHIFT>, + <¯o_release>, + <&kp LEFT_ALT>; + + label = "LANGSWTICH2"; + }; + + MinusG: MinusG { + compatible = "zmk,behavior-macro"; + #binding-cells = <0>; + bindings = + <¯o_press>, + <&kp RIGHT_ALT>, + <¯o_press>, + <&kp RCTRL>, + <¯o_tap>, + <&kp MINUS>, + <¯o_release>, + <&kp RIGHT_ALT &kp RCTRL &kp MINUS>; + + label = "MINUSG"; + }; + }; + keymap { compatible = "zmk,keymap"; default_layer { bindings = < - &kp GRAVE &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT - &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &mt RCTRL SQT - &kp LALT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mt RALT BSLH - &kp LGUI < 2 TAB &mt LSHFT SPACE < 1 RET < 1 ESC &mt RSHFT BSPC < 2 DEL &mt RGUI RIGHT_BRACKET + &mt LCTRL RIGHT_BRACKET &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT + &kp LEFT_COMMAND &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT + &kp LALT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp MINUS + &kp ESCAPE < 2 TAB &kp LEFT_SHIFT < 1 RET < 1 SPACE &kp BACKSPACE < 2 DEL &kp BACKSLASH >; }; lower_layer { bindings = < - &kp UNDER &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 - &mt LCTRL PLUS &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &mt RCTRL MINUS - &mt LALT EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans - &trans < 3 TAB &trans &trans &trans &trans < 3 DEL &trans + &kp LCTRL &kp F1 &kp F2 &kp F3 &kp F4 &kp CAPSLOCK &kp EXCLAMATION &kp AT_SIGN &kp HASH &kp DOLLAR &kp PERCENT &kp RWIN + &kp LEFT_WIN &kp F5 &kp F6 &kp F7 &kp F8 &kp BACKSPACE &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &kp RCTRL + &kp LEFT_ALT &kp F9 &kp F10 &kp F11 &kp F12 &kp SPACE &kp EQUAL &kp MINUS &kp PLUS &kp TILDE &kp GRAVE &kp RIGHT_ALT + &kp ESCAPE < 3 TAB &kp LEFT_SHIFT &trans &kp SPACE &mt RIGHT_SHIFT BACKSPACE < 3 DEL &kp BACKSLASH >; }; raise_layer { bindings = < - &kp KP_NUM &kp KP_SLASH &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp KP_MINUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp CAPS - &mt LCTRL EQUAL &kp KP_MULTIPLY &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp KP_PLUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &mt RCTRL K_APP - &trans &kp KP_N0 &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp KP_DOT &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp PAUSE_BREAK &trans - &trans &trans &trans < 3 RET < 3 ESC &trans &trans &trans + &kp LCTRL &kp ASTERISK &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp PLUS &kp C_VOL_UP &kp HOME &kp PSCRN &kp PG_UP &kp SLCK &kp RWIN + &kp LEFT_WIN &kp KP_SLASH &kp NUMBER_4 &kp N5 &kp NUMBER_6 &kp MINUS &kp C_MUTE &kp LEFT &kp UP &kp RIGHT &kp INS &kp LCTRL + &mt LEFT_ALT EQUAL &kp N0 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &dot &kp C_VOL_DN &kp END &kp DOWN &kp PG_DN &kp C_AL_CALCULATOR &kp RIGHT_ALT + &trans &trans &kp LEFT_SHIFT < 3 RET &kp SPACE &mt RIGHT_SHIFT BACKSPACE < 3 DELETE &kp BACKSLASH >; }; adjust_layer { bindings = < - &bootloader &none &none &none &none &none &none &none &none &none &none &bootloader - &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_SEL 4 &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0 &bt BT_CLR - &sys_reset &none &none &none &none &none &none &none &none &none &none &sys_reset - &none &trans &none &trans &trans &none &trans &none + &bootloader &none &none &none &none &none &none &none &none &none &none &bootloader + &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_SEL 4 &bt BT_SEL 3 &bt BT_SEL 2 &bt BT_SEL 1 &bt BT_SEL 0 &bt BT_CLR + &sys_reset &none &none &none &none &none &kp C_SLEEP_MODE &kp B &caps_word &none &none &sys_reset + &none &caps_word &none &trans &trans &none &trans &none >; }; };