From 916e84e41465dfbd537f278b797a53be425f5a16 Mon Sep 17 00:00:00 2001 From: Cem Aksoylar Date: Sat, 29 Jul 2023 22:25:08 -0700 Subject: [PATCH] Change jcmkk3's apt-like to bird --- README.md | 2 ++ config/3x5.dtsi | 14 +++++++------- config/combos.dtsi | 42 +++++++++++++++++++++--------------------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 1ed23bc6..9ce08fa1 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ Currently these keyboards are: It mainly uses three non-base layers activated through two thumb keys, along with combos. It has Ctrl/Shift thumb hold-taps along with home row mods, which are also available on the left side of `NAV` layer. `FUN` layer is implemented as a tri-layer, i.e. it is active when both `NAV` and `SYM` are active. +The default alpha layer is a modification of Colemak-DH and an alternative is the [Bird layout](https://github.com/jcmkk3/bird-layout) by @jcmkk3. + OS-dependent shortcuts are present on the `NAV` layer, e.g. for Windows: - `Win Close`: AltF4 - `Tab Next`: CtrlTab diff --git a/config/3x5.dtsi b/config/3x5.dtsi index 2f6712a1..26494e87 100644 --- a/config/3x5.dtsi +++ b/config/3x5.dtsi @@ -11,7 +11,7 @@ // Layer aliases #define DEF 0 -#define APT 1 +#define BRD 1 #define GME 2 #define SYM 3 #define NAV 4 @@ -215,15 +215,15 @@ >; }; - apt30_layer { - label = "APT"; + bird_layer { + label = "BRD"; bindings = < // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ - &kp W &kp C &kp G &kp D &kp B &kp J &kp L &kp U &kp O &kp Y + &kp X &kp C &kp L &kp F &kp B &kp J &kp Y &kp O &kp U &kp SQT // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ - &aml LCTRL R &aml LGUI S &aml LALT T &asl LSHFT H &kp K &kp X &asr RSHFT N &amr RALT E &amr RGUI A &amr RCTRL I + &aml LCTRL R &aml LGUI S &aml LALT N &asl LSHFT T &kp P &kp K &asr RSHFT H &amr RALT E &amr RGUI I &amr RCTRL A // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ - ALP_XXX &kp F &kp M MS_ACT(P) ALP_XXX ALP_XXX &kp SQT &kp COMMA &kp DOT ALP_XXX + ALP_XXX &kp W &kp M MS_ACT(G) ALP_XXX ALP_XXX &kp D &kp COMMA &kp DOT ALP_XXX // ╰─────────────┴─────────────┴─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┴─────────────┴─────────────╯ T3_L_DEF &mt LCTRL ESC < NAV BSPC < SYM SPACE &mt RSHFT RET T3_R_DEF // ╰─────────────┴─────────────╯ ╰─────────────┴─────────────╯ @@ -279,7 +279,7 @@ label = "FUN"; bindings = < // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ - &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &out OUT_USB &out OUT_BLE &to DEF &to APT &to GME + &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &out OUT_USB &out OUT_BLE &to DEF &to BRD &to GME // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 // ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ ├─────────────┼─────────────┼─────────────┼─────────────┼─────────────┤ diff --git a/config/combos.dtsi b/config/combos.dtsi index 68dd216e..cc6b3535 100644 --- a/config/combos.dtsi +++ b/config/combos.dtsi @@ -21,34 +21,34 @@ compatible = "zmk,combos"; COMBO(j, &kp J, 2 3, DEF, 80, 50) -COMBO(q, &kp Q, 2 3, APT, 80, 50) -COMBO(v_apt, &kp V, 1 2, APT, 80, 50) -COMBO(semi, &kp SEMI, 6 7, DEF APT, 40, 100) -COMBO(grave, &kp GRAVE, 7 8, DEF APT, 40, 100) -COMBO(lpar, &kp LPAR, 12 13, DEF APT, 40, 100) -COMBO(rpar, &kp RPAR, 16 17, DEF APT, 40, 100) -COMBO(lbkt, &kp LBKT, 11 12, DEF APT, 40, 100) -COMBO(rbkt, &kp RBKT, 17 18, DEF APT, 40, 100) -COMBO(tab, &kp TAB, 11 13, DEF APT, 40, 200) -COMBO(bspc, &kp BSPC, 16 18, DEF APT, 40, 200) +COMBO(q, &kp Q, 2 3, BRD, 80, 50) +COMBO(v_brd, &kp V, 1 2, BRD, 80, 50) +COMBO(semi, &kp SEMI, 6 7, DEF BRD, 40, 100) +COMBO(grave, &kp GRAVE, 7 8, DEF BRD, 40, 100) +COMBO(lpar, &kp LPAR, 12 13, DEF BRD, 40, 100) +COMBO(rpar, &kp RPAR, 16 17, DEF BRD, 40, 100) +COMBO(lbkt, &kp LBKT, 11 12, DEF BRD, 40, 100) +COMBO(rbkt, &kp RBKT, 17 18, DEF BRD, 40, 100) +COMBO(tab, &kp TAB, 11 13, DEF BRD, 40, 200) +COMBO(bspc, &kp BSPC, 16 18, DEF BRD, 40, 200) -COMBO(capswd, &caps_word, 13 16, DEF APT, 60, 200) +COMBO(capswd, &caps_word, 13 16, DEF BRD, 60, 200) COMBO(play, &kp C_PP, 4 14, NAV, 200, 200) #ifdef ALPHA_23332 -COMBO(z, &kp Z, 20 21, DEF APT, 80, 50) +COMBO(z, &kp Z, 20 21, DEF BRD, 80, 50) COMBO(v, &kp V, 21 22, DEF, 40, 50) -COMBO(bslh, &kp BSLH, 23 24, DEF APT, 80, 100) -COMBO(slsh, &kp SLASH, 24 25, DEF APT, 80, 50) +COMBO(bslh, &kp BSLH, 23 24, DEF BRD, 80, 100) +COMBO(slsh, &kp SLASH, 24 25, DEF BRD, 80, 50) COMBO(f12, &kp F12, 20 21, FUN, 100, 200) COMBO(btclr, &bt BT_CLR, 24 25, FUN, 100, 200) #else -COMBO(z, &kp Z, 21 22, DEF APT, 80, 50) +COMBO(z, &kp Z, 21 22, DEF BRD, 80, 50) COMBO(v, &kp V, 22 23, DEF, 40, 50) -COMBO(bslh, &kp BSLH, 26 27, DEF APT, 80, 100) -COMBO(slsh, &kp SLASH, 27 28, DEF APT, 80, 50) +COMBO(bslh, &kp BSLH, 26 27, DEF BRD, 80, 100) +COMBO(slsh, &kp SLASH, 27 28, DEF BRD, 80, 50) COMBO(f12, &kp F12, 21 22, FUN, 100, 200) COMBO(btclr, &bt BT_CLR, 27 28, FUN, 100, 200) @@ -57,15 +57,15 @@ COMBO(btclr, &bt BT_CLR, 27 28, FUN, 100, 200) #ifdef MOUSE_KEYS # ifdef THREE_THUMBS # ifdef ALPHA_23332 -COMBO(mse_l, &mo MSE, 27 28, DEF APT, 100, 0) +COMBO(mse_l, &mo MSE, 27 28, DEF BRD, 100, 0) # else -COMBO(mse_l, &mo MSE, 31 32, DEF APT, 100, 0) +COMBO(mse_l, &mo MSE, 31 32, DEF BRD, 100, 0) # endif # else # ifdef ALPHA_23332 -COMBO(mse_l, &mo MSE, 26 27, DEF APT, 100, 0) +COMBO(mse_l, &mo MSE, 26 27, DEF BRD, 100, 0) # else -COMBO(mse_l, &mo MSE, 30 31, DEF APT, 100, 0) +COMBO(mse_l, &mo MSE, 30 31, DEF BRD, 100, 0) # endif # endif #endif