From 79a3f7e19a9390a1f8978a6158286415e051fb94 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Wed, 9 Apr 2025 14:17:42 +0300 Subject: [PATCH] config/hillside46.keymap: qwerty by default config/hillside46.conf: add CONFIG_ZMK_POINTING flake.nix: update hash, remove CONFIG_ZMK_POINTING now that colemak-dh-ortho layout is set in the operating system/desktop environment for me, qwerty layer is the default, and colemak-dh layer is still there for other usecases Signed-off-by: unexplrd --- config/hillside46.conf | 3 ++ config/hillside46.keymap | 81 +++++++++++++++++++--------------------- flake.lock | 12 +++--- flake.nix | 5 +-- 4 files changed, 49 insertions(+), 52 deletions(-) diff --git a/config/hillside46.conf b/config/hillside46.conf index eba7959..89050fa 100644 --- a/config/hillside46.conf +++ b/config/hillside46.conf @@ -13,3 +13,6 @@ CONFIG_ZMK_SLEEP=y # Boost the Bluetooth signal only if having connection issues CONFIG_BT_CTLR_TX_PWR_PLUS_8=y + +# Mouse mode +CONFIG_ZMK_POINTING=y diff --git a/config/hillside46.keymap b/config/hillside46.keymap index a615849..1dbefa0 100644 --- a/config/hillside46.keymap +++ b/config/hillside46.keymap @@ -1,21 +1,18 @@ #include #include #include -#include -#include -#include #include #include &mt { - quick-tap-ms = <180>; - tapping-term-ms = <180>; + quick-tap-ms = <200>; + tapping-term-ms = <200>; flavor = "tap-preferred"; }; < { - quick-tap-ms = <180>; - tapping-term-ms = <180>; + quick-tap-ms = <200>; + tapping-term-ms = <200>; flavor = "tap-preferred"; }; @@ -51,66 +48,66 @@ keymap { compatible = "zmk,keymap"; - colemak-dh { + qwerty { bindings = < -&kp RBKT &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp SINGLE_QUOTE &kp LBKT -&kp GRAVE &mt LALT A &mt LGUI R &mt LCTRL S &mt LSHIFT T &kp G &kp M &mt LSHIFT N &mt LCTRL E &mt LGUI I &mt LALT O &kp SEMICOLON -&kp BSLH &kp Z &mt RALT X &kp C &kp D &kp V &lang_switch &lang_switch &kp K &kp H &kp COMMA &mt RALT DOT &kp FSLH &kp MINUS - &sk LG(LS(LA(LCTRL))) < 4 ESC < 3 SPACE < 5 TAB < 8 ENTER < 6 BACKSPACE &kp DEL &none +&kp RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT +&kp GRAVE &mt LALT A &mt LGUI S &mt LCTRL D &mt LSHIFT F &kp G &kp H &mt LSHIFT J &mt LCTRL K &mt LGUI L &mt LALT SEMICOLON &kp APOS +&kp BSLH &kp Z &mt RALT X &kp C &kp V &kp B &tog 1 &tog 1 &kp N &kp M &kp COMMA &mt RALT DOT &kp FSLH &kp MINUS + &sk LG(LS(LA(LCTRL))) < 4 ESC < 3 SPACE < 5 TAB < 8 ENTER < 6 BACKSPACE &kp DEL &none >; }; - qwerty_ukr { + colemak-dh { bindings = < -&kp RBKT &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT -&kp GRAVE &mt LALT A &mt LGUI S &mt LCTRL D &mt LSHIFT F &kp G &kp H &mt LSHIFT J &mt LCTRL K &mt LGUI L &mt LALT SEMICOLON &kp APOS -&kp BSLH &kp Z &mt RALT X &kp C &kp V &kp B &lang_switch &lang_switch &kp N &kp M &kp COMMA &mt RALT DOT &kp FSLH &kp MINUS - &trans &trans &trans &trans &trans &trans &trans &trans +&kp RBKT &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp SINGLE_QUOTE &kp LBKT +&kp GRAVE &mt LALT A &mt LGUI R &mt LCTRL S &mt LSHIFT T &kp G &kp M &mt LSHIFT N &mt LCTRL E &mt LGUI I &mt LALT O &kp SEMICOLON +&kp BSLH &kp Z &mt RALT X &kp C &kp D &kp V &trans &trans &kp K &kp H &kp COMMA &mt RALT DOT &kp FSLH &kp MINUS + &trans &trans &trans &trans &trans &trans &trans &trans >; }; geimu { bindings = < -&kp GRAVE &kp Q &kp W &kp F &kp P &kp B &kp J &kp L &kp U &kp Y &kp SINGLE_QUOTE &kp LBKT -&kp LSHIFT &kp A &kp R &kp S &kp T &kp G &kp M &mt LSHIFT N &mt LCTRL E &mt LGUI I &mt LALT O &kp SEMICOLON -&kp LCTRL &kp Z &kp X &kp C &kp D &kp V &tog 2 &lang_switch &kp K &kp H &kp COMMA &mt RALT DOT &kp FSLH &kp MINUS - &kp BACKSLASH &kp ESC &kp SPACE &kp TAB < 8 ENTER < 6 BACKSPACE &kp DEL &none - >; +&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 LSHIFT &kp A &kp S &kp D &kp F &kp F &kp H &mt LSHIFT J &mt LCTRL K &mt LGUI L &mt LALT SEMICOLON &kp APOS +&kp LCTRL &kp Z &kp X &kp C &kp V &kp B &kp MINUS &kp EQUAL &kp N &kp M &kp COMMA &mt RALT DOT &kp FSLH &kp RBKT + &kp CAPS &kp ESC &kp SPACE &kp TAB < 8 ENTER < 6 BACKSPACE &kp DEL &kp BSLH + >; }; nav { bindings = < -&none &none &none &none &none &none &none &kp HOME &kp PG_DN &kp PG_UP &kp END &none -&none &kp LALT &kp LGUI &kp LCTRL &kp LSHFT &none &caps_w_l &kp LEFT &kp DOWN &kp UP &kp RIGHT &none -&none &none &kp RALT &none &none &none &none &none &none &none &none &none &none &none - &none &none &trans &none &kp RET &kp BSPC &kp DEL &none +&none &none &none &none &none &none &none &kp HOME &kp PG_DN &kp PG_UP &kp END &none +&none &kp LALT &kp LGUI &kp LCTRL &kp LSHFT &none &caps_w_l &kp LEFT &kp DOWN &kp UP &kp RIGHT &none +&none &none &kp RALT &none &none &none &none &none &none &none &none &none &none &none + &none &none &trans &none &kp RET &kp BSPC &kp DEL &none >; }; media { bindings = < -&none &none &none &none &none &none &rgb_ug RGB_TOG &rgb_ug RGB_EFF &rgb_ug RGB_HUI &rgb_ug RGB_SAI &rgb_ug RGB_EFF &bt BT_CLR -&none &kp LALT &kp LGUI &kp LCTRL &kp LSHFT &none &rgb_ug RGB_BRI &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_NEXT &none -&none &none &kp RALT &none &none &none &none &none &rgb_ug RGB_SPI &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &none - &none &trans &none &none &kp C_STOP &kp C_PP &kp C_MUTE &none +&none &none &none &none &none &none &rgb_ug RGB_TOG &rgb_ug RGB_EFF &rgb_ug RGB_HUI &rgb_ug RGB_SAI &rgb_ug RGB_EFF &bt BT_CLR +&none &kp LALT &kp LGUI &kp LCTRL &kp LSHFT &none &rgb_ug RGB_BRI &kp C_PREV &kp C_VOL_DN &kp C_VOL_UP &kp C_NEXT &none +&none &none &kp RALT &none &none &none &none &none &rgb_ug RGB_SPI &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &none + &none &trans &none &none &kp C_STOP &kp C_PP &kp C_MUTE &none >; }; mouse { bindings = < -&none &none &none &none &none &none &none &mkp MB4 &none &none &mkp MB5 &none -&none &none &none &none &none &none &none &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_UP &mmv MOVE_RIGHT &none -&none &none &none &none &none &none &none &none &none &msc SCRL_LEFT &msc SCRL_DOWN &msc SCRL_UP &msc SCRL_RIGHT &none - &none &none &none &trans &mkp MB2 &mkp MB1 &mkp MB3 &none +&none &none &none &none &none &none &none &mkp MB4 &none &none &mkp MB5 &none +&none &none &none &none &none &none &none &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_UP &mmv MOVE_RIGHT &none +&none &none &none &none &none &none &none &none &none &msc SCRL_LEFT &msc SCRL_DOWN &msc SCRL_UP &msc SCRL_RIGHT &none + &none &none &none &trans &mkp MB2 &mkp MB1 &mkp MB3 &none >; }; num { bindings = < -&none &kp LBKT &kp N7 &kp N8 &kp N9 &kp RBKT &none &none &none &none &none &none -&none &kp SEMI &kp N4 &kp N5 &kp N6 &kp EQUAL &none &kp LSHFT &kp LCTRL &kp LGUI &kp LALT &none -&none &kp GRAVE &kp N1 &kp N2 &kp N3 &kp BSLH &none &none &none &none &none &kp RALT &none &none - &none &kp KP_DOT &kp N0 &kp MINUS &none &trans &none &none +&none &kp LBKT &kp N7 &kp N8 &kp N9 &kp RBKT &none &none &none &none &none &none +&none &kp SEMI &kp N4 &kp N5 &kp N6 &kp EQUAL &none &kp LSHFT &kp LCTRL &kp LGUI &kp LALT &none +&none &kp GRAVE &kp N1 &kp N2 &kp N3 &kp BSLH &none &none &none &none &none &kp RALT &none &none + &none &kp KP_DOT &kp N0 &kp MINUS &none &trans &none &none >; }; @@ -125,10 +122,10 @@ fun { bindings = < -&none &kp F12 &kp F7 &kp F8 &kp F9 &kp PSCRN &none &none &none &none &none &none -&none &kp F11 &kp F4 &kp F5 &kp F6 &kp SCROLLLOCK &none &kp LSHFT &kp LCTRL &kp LGUI &kp LALT &none -&none &kp F10 &kp F1 &kp F2 &kp F3 &kp C_PAUSE &tog 2 &none &none &none &none &kp RALT &none &none - &none &kp ESC &kp SPACE &kp TAB &trans &none &none &none +&none &kp F12 &kp F7 &kp F8 &kp F9 &kp PSCRN &none &none &none &none &none &none +&none &kp F11 &kp F4 &kp F5 &kp F6 &kp SCROLLLOCK &none &kp LSHFT &kp LCTRL &kp LGUI &kp LALT &none +&none &kp F10 &kp F1 &kp F2 &kp F3 &kp C_PAUSE &tog 2 &none &none &none &none &kp RALT &none &none + &none &kp ESC &kp SPACE &kp TAB &trans &none &none &none >; }; }; diff --git a/flake.lock b/flake.lock index 3d4c472..d6a2552 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1742800061, - "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=", + "lastModified": 1744096231, + "narHash": "sha256-kUfx3FKU1Etnua3EaKvpeuXs7zoFiAcli1gBwkPvGSs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1750f3c1c89488e2ffdd47cab9d05454dddfb734", + "rev": "b2b0718004cc9a5bca610326de0a82e6ea75920b", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1742690277, - "narHash": "sha256-aMpj64fdAi6R3Mkp5bcQwIpmDUne9bwY0mOcCilWnsI=", + "lastModified": 1743899905, + "narHash": "sha256-uD/DbM7Y957gtA0n2fmeptNH0sRrMCCFj8MjxdxHsjI=", "owner": "lilyinstarlight", "repo": "zmk-nix", - "rev": "d77e4d5a3dc92e7d5e6cdff058a47edccf647175", + "rev": "ac654125cf109d6d1ceea238eb09d1bfa02b73be", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f1ad75e..cee82d1 100644 --- a/flake.nix +++ b/flake.nix @@ -25,11 +25,8 @@ board = "nice_nano_v2"; shield = "hillside46_%PART%"; - extraCmakeFlags = [ - "-DCONFIG_ZMK_POINTING=y" - ]; - zephyrDepsHash = "sha256-1nMZWSEmDuUWoYvsUE4eV5fBAD6kNFw0ZHF3jDKwpLg="; + zephyrDepsHash = "sha256-R+2W/onIy4VfB61OkiNoZyez20VtVDbp2GnAALXwYt8="; meta = { description = "ZMK firmware";