diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/corne.conf | 2 | ||||
-rw-r--r-- | config/corne.keymap | 54 | ||||
-rw-r--r-- | config/corneish_zen_v1.conf | 2 | ||||
-rw-r--r-- | config/corneish_zen_v1.keymap | 54 | ||||
-rw-r--r-- | config/flake.conf | 2 | ||||
-rw-r--r-- | config/flake.keymap | 10 | ||||
-rw-r--r-- | config/revxlp.conf | 2 | ||||
-rw-r--r-- | config/splitkb_aurora_sweep.conf | 2 | ||||
-rw-r--r-- | config/splitkb_aurora_sweep.keymap | 55 | ||||
-rw-r--r-- | config/util.h | 33 | ||||
-rw-r--r-- | config/west.yml | 5 |
11 files changed, 22 insertions, 199 deletions
diff --git a/config/corne.conf b/config/corne.conf deleted file mode 100644 index d85021a..0000000 --- a/config/corne.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SLEEP=y -CONFIG_ZMK_USB_LOGGING=n diff --git a/config/corne.keymap b/config/corne.keymap deleted file mode 100644 index 7b27e3d..0000000 --- a/config/corne.keymap +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2025 [email protected] -// SPDX-License-Identifier: MIT -#include <behaviors.dtsi> -#include <dt-bindings/zmk/keys.h> -#include <dt-bindings/zmk/bt.h> -#include "util.h" - -/ { - keymap { - compatible = "zmk,keymap"; - 0 { - bindings = < - &none &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &none - &none HRML(A, S, D, F) &kp G &kp H HRMR(J, K, L, SEMI) &none - &none &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &trans - &updir < 1 ESC &kp SPACE &kp BSPC < 2 RS(RC(V)) &pnp - >; - }; - 1 { - bindings = < - &trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans - &trans HRML(EXCL, AT, HASH, DLLR) &kp PRCNT &kp CARET HRMR(AMPS, ASTRK, LPAR, RPAR) &trans - &trans &kp C_VOL_DN &kp TAB &kp CAPS &kp TILDE &kp GRAVE &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp C_VOL_UP &trans - &none &trans &none &none &none &none - >; - }; - 2 { - bindings = < - &trans &bootloader &bt BT_NXT &none &none &none &none &none &none &none &none &trans - &trans &bt BT_CLR &bt BT_PRV &none &none &none &none &none &none &none &none &trans - &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans - &none &none &none &none &trans &none - >; - }; - }; - - combos { - compatible = "zmk,combos"; - // name output pos. - COMBO(we_eqal, &kp EQUAL, 2 3) - COMBO(er_cbkt, &td_cbrkt, 3 4) - COMBO(rt_bsls, &kp BSLH, 4 5) - COMBO(yu_quot, &kp QUOT, 6 7) - COMBO(ui_brkt, &td_brkt, 7 8) - COMBO(io_mins, &td_min_dash, 8 9) - COMBO(sd_plus, &kp PLUS, 14 15) - COMBO(df_coln, &kp COLON, 15 16) - COMBO(fg_pipe, &kp PIPE, 16 17) - COMBO(hj_dquo, &kp DQT, 18 19) - COMBO(jk_entr, &kp ENTER, 19 20) - COMBO(kl_unds, &kp UNDER, 20 21) - COMBO(fj_capw, &caps_word, 16 19) - }; -}; diff --git a/config/corneish_zen_v1.conf b/config/corneish_zen_v1.conf deleted file mode 100644 index d85021a..0000000 --- a/config/corneish_zen_v1.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SLEEP=y -CONFIG_ZMK_USB_LOGGING=n diff --git a/config/corneish_zen_v1.keymap b/config/corneish_zen_v1.keymap deleted file mode 100644 index 7b27e3d..0000000 --- a/config/corneish_zen_v1.keymap +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2025 [email protected] -// SPDX-License-Identifier: MIT -#include <behaviors.dtsi> -#include <dt-bindings/zmk/keys.h> -#include <dt-bindings/zmk/bt.h> -#include "util.h" - -/ { - keymap { - compatible = "zmk,keymap"; - 0 { - bindings = < - &none &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &none - &none HRML(A, S, D, F) &kp G &kp H HRMR(J, K, L, SEMI) &none - &none &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &trans - &updir < 1 ESC &kp SPACE &kp BSPC < 2 RS(RC(V)) &pnp - >; - }; - 1 { - bindings = < - &trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans - &trans HRML(EXCL, AT, HASH, DLLR) &kp PRCNT &kp CARET HRMR(AMPS, ASTRK, LPAR, RPAR) &trans - &trans &kp C_VOL_DN &kp TAB &kp CAPS &kp TILDE &kp GRAVE &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp C_VOL_UP &trans - &none &trans &none &none &none &none - >; - }; - 2 { - bindings = < - &trans &bootloader &bt BT_NXT &none &none &none &none &none &none &none &none &trans - &trans &bt BT_CLR &bt BT_PRV &none &none &none &none &none &none &none &none &trans - &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans - &none &none &none &none &trans &none - >; - }; - }; - - combos { - compatible = "zmk,combos"; - // name output pos. - COMBO(we_eqal, &kp EQUAL, 2 3) - COMBO(er_cbkt, &td_cbrkt, 3 4) - COMBO(rt_bsls, &kp BSLH, 4 5) - COMBO(yu_quot, &kp QUOT, 6 7) - COMBO(ui_brkt, &td_brkt, 7 8) - COMBO(io_mins, &td_min_dash, 8 9) - COMBO(sd_plus, &kp PLUS, 14 15) - COMBO(df_coln, &kp COLON, 15 16) - COMBO(fg_pipe, &kp PIPE, 16 17) - COMBO(hj_dquo, &kp DQT, 18 19) - COMBO(jk_entr, &kp ENTER, 19 20) - COMBO(kl_unds, &kp UNDER, 20 21) - COMBO(fj_capw, &caps_word, 16 19) - }; -}; diff --git a/config/flake.conf b/config/flake.conf deleted file mode 100644 index d85021a..0000000 --- a/config/flake.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SLEEP=y -CONFIG_ZMK_USB_LOGGING=n diff --git a/config/flake.keymap b/config/flake.keymap index bcfac85..594e1c5 100644 --- a/config/flake.keymap +++ b/config/flake.keymap @@ -10,10 +10,10 @@ compatible = "zmk,keymap"; 0 { bindings = < - &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P - HRML(A, S, D, F) &kp G &kp H HRMR(J, K, L, SEMI) - &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH - &none &updir < 1 ESC &kp SPACE &none &none &kp BSPC < 2 RS(RC(V)) &pnp &none + &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P + HRML(A, S, D, F) &kp G &kp H HRMR(J, K, L, SEMI) + &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH + &none &none &updir < 1 ESC &kp SPACE &kp BSPC < 2 RS(RC(V)) &pnp &none &none >; }; 1 { @@ -50,7 +50,7 @@ COMBO(hj_dquo, &kp DQT, 15 16) COMBO(jk_entr, &kp ENTER, 16 17) COMBO(kl_unds, &kp UNDER, 17 18) - COMBO(fj_capw, &caps_word, 15 18) + COMBO(fj_capw, &caps_word, 13 16) }; }; diff --git a/config/revxlp.conf b/config/revxlp.conf deleted file mode 100644 index d85021a..0000000 --- a/config/revxlp.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SLEEP=y -CONFIG_ZMK_USB_LOGGING=n diff --git a/config/splitkb_aurora_sweep.conf b/config/splitkb_aurora_sweep.conf deleted file mode 100644 index d85021a..0000000 --- a/config/splitkb_aurora_sweep.conf +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ZMK_SLEEP=y -CONFIG_ZMK_USB_LOGGING=n diff --git a/config/splitkb_aurora_sweep.keymap b/config/splitkb_aurora_sweep.keymap deleted file mode 100644 index 0ef0e7a..0000000 --- a/config/splitkb_aurora_sweep.keymap +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright 2025 [email protected] -// SPDX-License-Identifier: MIT -#include <behaviors.dtsi> -#include <dt-bindings/zmk/keys.h> -#include <dt-bindings/zmk/bt.h> -#include "util.h" - -/ { - keymap { - compatible = "zmk,keymap"; - 0 { - bindings = < - &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P - HRML(A, S, D, F) &kp G &kp H HRMR(J, K, L, SEMI) - &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH - < 1 ESC &kp SPACE &kp BSPC < 2 RS(RC(V)) - >; - }; - 1 { - bindings = < - &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 - HRML(EXCL, AT, HASH, DLLR) &kp PRCNT &kp CARET HRMR(AMPS, ASTRK, LPAR, RPAR) - &kp C_VOL_DN &kp TAB &kp CAPS &kp TILDE &kp GRAVE &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp C_VOL_UP - &trans &trans &trans &pnp - >; - }; - 2 { - bindings = < - &bootloader &bt BT_NXT &none &none &none &none &none &none &none &none - &bt BT_CLR &bt BT_PRV &none &none &none &none &none &none &none &none - &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 - &trans &trans &trans &trans - >; - }; - }; - - combos { - compatible = "zmk,combos"; - // name output pos. - COMBO(we_eqal, &kp EQUAL, 1 2) - COMBO(er_cbkt, &td_cbrkt, 2 3) - COMBO(rt_bsls, &kp BSLH, 3 4) - COMBO(yu_quot, &kp QUOT, 5 6) - COMBO(ui_brkt, &td_brkt, 6 7) - COMBO(io_mins, &td_min_dash, 7 8) - COMBO(sd_plus, &kp PLUS, 11 12) - COMBO(df_coln, &kp COLON, 12 13) - COMBO(fg_pipe, &kp PIPE, 13 14) - COMBO(hj_dquo, &kp DQT, 15 16) - COMBO(jk_entr, &kp ENTER, 16 17) - COMBO(kl_unds, &kp UNDER, 17 18) - COMBO(fj_capw, &caps_word, 15 18) - - }; -}; diff --git a/config/util.h b/config/util.h index a658ea1..f515d75 100644 --- a/config/util.h +++ b/config/util.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: MIT // clang-format off @@ -9,13 +9,12 @@ combo_##name { \ key-positions = <keypos>; \ }; -#define TAP_DANCE(name, keypress1, keypress2) \ -td_##name: name { \ - compatible = "zmk,behavior-tap-dance"; \ - label = ###name; \ - #binding-cells = <0>; \ - tapping-term-ms = <200>; \ - bindings = <keypress1>, <keypress2>; \ +#define TAP_DANCE(name, kp1, kp2, kp3) \ +td_##name: name { \ + compatible = "zmk,behavior-tap-dance"; \ + #binding-cells = <0>; \ + tapping-term-ms = <200>; \ + bindings = <kp1>, <kp2>, <kp3>; \ }; #define HRML(k1,k2,k3,k4) &hm LALT k1 &hm LGUI k2 &hm LCTRL k3 &hm LSHFT k4 @@ -29,7 +28,6 @@ td_##name: name { \ behaviors { hm: homerow_mods { compatible = "zmk,behavior-hold-tap"; - label = "HOMEROW_MODS"; #binding-cells = <2>; tapping-term-ms = <130>; quick-tap-ms = <160>; @@ -39,30 +37,33 @@ td_##name: name { \ pnp: play_next_prev { compatible = "zmk,behavior-tap-dance"; - label = "PLAY_NEXT_PREV"; #binding-cells = <0>; tapping-term-ms = <210>; bindings = <&kp C_PLAY>, <&kp C_NEXT>, <&kp C_PREV>; }; - TAP_DANCE(cbrkt, &kp LBRC, &kp RBRC) - TAP_DANCE(brkt, &kp LBKT, &kp RBKT) - TAP_DANCE(min_dash, &kp MINUS, &emdash) + TAP_DANCE(cbrkt, &kp LBRC, &kp RBRC, &none) + TAP_DANCE(brkt, &kp LBKT, &kp RBKT, &none) + TAP_DANCE(min_dash, &kp MINUS, &dbl_min, &emdash) }; macros { updir: updir { - label = "UP_DIR"; compatible = "zmk,behavior-macro"; #binding-cells = <0>; bindings = <¯o_tap &kp DOT &kp DOT &kp FSLH>; }; + dbl_min: dbl_min { + compatible = "zmk,behavior-macro"; + #binding-cells = <0>; + bindings = <¯o_tap &kp MINUS &kp MINUS>; + }; emdash: emdash { - label = "EM_DASH"; compatible = "zmk,behavior-macro"; #binding-cells = <0>; bindings = <¯o_press &kp LSHFT &kp LCTRL>, <¯o_tap &kp U &kp N2 &kp N0 &kp N1 &kp N4>, - <¯o_release &kp LSHFT &kp LCTRL>; + <¯o_release &kp LSHFT &kp LCTRL>, + <¯o_tap &kp SPACE &kp SPACE>; }; }; }; diff --git a/config/west.yml b/config/west.yml index 8657bf9..379d291 100644 --- a/config/west.yml +++ b/config/west.yml @@ -2,15 +2,10 @@ manifest: remotes: - name: zmkfirmware url-base: https://github.com/zmkfirmware - - name: petejohanson - url-base: https://github.com/petejohanson projects: - name: zmk remote: zmkfirmware revision: main import: app/west.yml - - name: revxlp-config - remote: petejohanson - revision: main self: path: config |