diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f280203cc..0691e8f71 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ -on: [push, pull_request, workflow_dispatch] - -jobs: - build: - uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main +on: [push, pull_request, workflow_dispatch] + +jobs: + build: + uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@v0.3 diff --git a/config/lily58.keymap b/config/lily58.keymap index a27f1d733..ae99f6f80 100644 --- a/config/lily58.keymap +++ b/config/lily58.keymap @@ -10,11 +10,37 @@ / { behaviors { - hm: homerow_mods { + hm_shift: hm_shift { compatible = "zmk,behavior-hold-tap"; - label = "HOMEROW_MODS"; #binding-cells = <2>; - tapping-term-ms = <150>; + tapping-term-ms = <300>; + quick-tap-ms = <0>; + flavor = "tap-preferred"; + bindings = <&kp>, <&kp>; + }; + + hm_slow: hm_slow { + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + tapping-term-ms = <500>; + quick-tap-ms = <0>; + flavor = "balanced"; + bindings = <&kp>, <&kp>; + }; + + hm_fast: hm_fast { + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + tapping-term-ms = <200>; + quick-tap-ms = <0>; + flavor = "balanced"; + bindings = <&kp>, <&kp>; + }; + + hm_gui: hm_gui { + compatible = "zmk,behavior-hold-tap"; + #binding-cells = <2>; + tapping-term-ms = <250>; quick-tap-ms = <0>; flavor = "tap-preferred"; bindings = <&kp>, <&kp>; @@ -94,11 +120,6 @@ key-positions = <24 28 27>; }; - L_mo_keeb { - bindings = <&mo 4>; - key-positions = <53 24>; - }; - r_mo_fkeys { bindings = <&mo 2>; key-positions = <54 35>; @@ -113,8 +134,8 @@ bindings = < &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &none &none &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &none -&none &hm LSHIFT A &hm LGUI S &hm LALT D &hm LCTRL F &kp G &kp H &hm LCTRL J &hm LALT K &hm RGUI L &hm RSHIFT SEMI &kp APOSTROPHE -&none &kp Z &kp X &kp C &kp V &kp B &none &none &kp N &kp M &kp COMMA &kp DOT &kp FSLH &none +&none &hm_shift LSHIFT A &hm_slow LGUI S &hm_slow LALT D &hm_fast LCTRL F &kp G &kp H &hm_slow LCTRL J &hm_slow LALT K &hm_gui RGUI L &hm_slow RSHIFT SEMI &kp APOSTROPHE +&mo 9 &kp Z &kp X &kp C &kp V &kp B &none &none &kp N &kp M &kp COMMA &kp DOT &kp FSLH &mo 10 &none < 1 TAB < 5 ENTER < 7 BACKSPACE < 8 SPACE < 2 TAB < 6 DEL &none >; }; @@ -168,7 +189,7 @@ bindings = < &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp CARET &kp AMPERSAND &kp ASTERISK &kp PERCENT &kp EQUAL &trans &trans &trans &trans &trans &trans -&trans &hm LSHIFT EXCLAMATION &hm LWIN AT_SIGN &hm LALT HASH &hm LCTRL DOLLAR &dash_dance 0 MINUS &trans &trans &trans &trans &trans &trans +&trans &hm_shift LSHIFT EXCLAMATION &hm_slow LWIN AT_SIGN &hm_slow LALT HASH &hm_fast LCTRL DOLLAR &dash_dance 0 MINUS &trans &trans &trans &trans &trans &trans &trans &kp GRAVE &dance RIGHT_BRACE LEFT_BRACE &dance RIGHT_BRACKET LEFT_BRACKET &dance RIGHT_PARENTHESIS LEFT_PARENTHESIS &kp BACKSLASH &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; @@ -179,7 +200,7 @@ bindings = < &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp EQUAL &kp PERCENT &kp ASTERISK &kp AMPERSAND &kp CARET &trans -&trans &trans &trans &trans &trans &trans &dash_dance 0 MINUS &hm LCTRL DOLLAR &hm LALT HASH &hm RWIN AT_SIGN &hm RSHIFT EXCLAMATION &trans +&trans &trans &trans &trans &trans &trans &dash_dance 0 MINUS &hm_slow LCTRL DOLLAR &hm_slow LALT HASH &hm_gui RWIN AT_SIGN &hm_slow RSHIFT EXCLAMATION &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp BACKSLASH &dance LEFT_PARENTHESIS RIGHT_PARENTHESIS &dance LEFT_BRACKET RIGHT_BRACKET &dance LEFT_BRACE RIGHT_BRACE &kp GRAVE &trans &trans &trans &trans &trans &trans &trans &trans &trans >; @@ -190,7 +211,7 @@ bindings = < &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LG(LC(LEFT)) &trans &trans &kp LG(LC(RIGHT)) &trans &trans &trans &trans &trans &trans -&mo 9 &trans &kp LEFT &kp UP_ARROW &kp DOWN_ARROW &kp RIGHT &trans &trans &trans &trans &trans &trans +&trans &trans &kp LEFT &kp UP_ARROW &kp DOWN_ARROW &kp RIGHT &trans &trans &trans &trans &trans &trans &trans &trans &kp HOME &kp PG_UP &kp PG_DN &kp END &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; @@ -201,7 +222,7 @@ bindings = < &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LG(LC(LEFT)) &trans &trans &kp LG(LC(RIGHT)) &trans &trans -&trans &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &mo 10 +&trans &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp HOME &kp PG_DN &kp PG_UP &kp END &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans >; diff --git a/config/west.yml b/config/west.yml index 9e6c15157..600749397 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,11 +1,11 @@ -manifest: - remotes: - - name: zmkfirmware - url-base: https://github.com/zmkfirmware - projects: - - name: zmk - remote: zmkfirmware - revision: main - import: app/west.yml - self: - path: config +manifest: + remotes: + - name: zmkfirmware + url-base: https://github.com/zmkfirmware + projects: + - name: zmk + remote: zmkfirmware + revision: v0.3 + import: app/west.yml + self: + path: config