From 996ab9dbc50a768ea4f2622a67c76086df713203 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 12 Apr 2021 21:52:04 -0500 Subject: [PATCH] Just need to get the adjustment layer working now --- zorne/build.fish | 6 ++-- zorne/config/corne.keymap | 70 ++++++++++++++++++++++++--------------- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/zorne/build.fish b/zorne/build.fish index 6a539f2..97b9c07 100755 --- a/zorne/build.fish +++ b/zorne/build.fish @@ -9,8 +9,8 @@ docker run -it --rm \ west update west zephyr-export echo "Building left" - west build -s zmk/app -b nice_nano -- -DSHIELD=corne_left -DZMK_CONFIG="/zorne/config" - cp build/zephyr/zmk.uf2 /build/corne_left_nice_nano.uf2 + west build --pristine -s zmk/app -b nice_nano -- -DSHIELD=corne_left -DZMK_CONFIG="/zorne/config" + cp /zorne/build/zephyr/zmk.uf2 /build/corne_left_nice_nano.uf2 echo "Building right" west build --pristine -s zmk/app -b nice_nano -- -DSHIELD=corne_right -DZMK_CONFIG="/zorne/config" - cp build/zephyr/zmk.uf2 /build/corne_right_nice_nano.uf2' + cp /zorne/build/zephyr/zmk.uf2 /build/corne_right_nice_nano.uf2' diff --git a/zorne/config/corne.keymap b/zorne/config/corne.keymap index 15d6e8b..d3960c9 100644 --- a/zorne/config/corne.keymap +++ b/zorne/config/corne.keymap @@ -9,7 +9,23 @@ #include #include +&mt { + tapping-term-ms = <200>; + flavor = "hold-preferred"; +}; + / { + behaviors { + ht: hold_tap { + compatible = "zmk,behavior-hold-tap"; + label = "Hold Tap"; + #binding-cells = <2>; + tapping-term-ms = <200>; + flavor = "tap-preferred"; + bindings = <&kp>, <&kp>; + }; + }; + keymap { compatible = "zmk,keymap"; @@ -21,23 +37,23 @@ // -------------------| GUI | SPC | LWR | | RSE | SPC | ALT |------------------- // ------------------- -------------------- bindings = < - &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RET - &kp LGUI &kp SPACE &mo 1 &mo 2 &kp SPACE &kp RALT + &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC + &mt LCTRL ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RET + &kp LGUI &kp SPACE &mo 1 &mo 2 &kp SPACE &kp RALT >; }; left_layer { // -------------------------------------- -------------------------------------- - // | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | - // | CTRL | | | | | | | | _ | + | { | } | "|" | - // | SHFT | | | | | | | | | < | > | ? | | // TODO: Fix this row when &mkp is committed - // -------------------| | | | | ADJ | ENT | |------------------- - // ------------------- ------------------- + // | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | + // | | | | | | | | | _ | + | { | } | "|" | + // | | | | | | | | | | < | > | ? | | // TODO: Fix this row when &mkp is committed + // ------------------| | | | | ADJ | ENT | |------------------- + // ------------------- ------------------- bindings = < &kp TILDE &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC - &kp LCTRL &trans &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE - &kp LSHFT &trans &trans &trans &trans &trans &trans &trans &kp GT &kp LT &kp QMARK &kp TILDE + &trans &trans &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE + &trans &trans &trans &trans &trans &trans &trans &trans &kp LT &kp GT &kp QMARK &kp TILDE &trans &trans &trans &mo 3 &kp RET &trans >; }; @@ -50,25 +66,25 @@ // ------------------- ------------------- bindings = < &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC - &trans &trans &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kb BSLH - &trans &trans &trans &trans &trans &trans &trans &kb INS &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH + &trans &trans &trans &trans &trans &trans &trans &kp INS &trans &trans &trans &trans &trans &kp LALT &mo 3 &trans &trans &trans >; }; - adjust_layer { - // ------------------------------------- ------------------------------------- - // | | LCL | MSU | RCL | MWU | | | MNX | MVD | MPL | MVU | MPV | | // TODO: once mouse keys exist - // | | MSL | MSD | MSR | MWD | USB | | LFT | DWN | UP | RGT | | | // TODO: once mouse keys exist - // |CONFG| BT1 | BT2 | BT3 | BT4 | BT5 | | | | | | | | - // ------------------| | | | | | | |------------------ - // ------------------- ------------------- - bindings = < - &trans &trans &trans &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp K_PP &kp C_VOL_UP &kp C_PREV &trans - &trans &trans &trans &trans &trans &out USB &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans - &mo 4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans - >; - }; + /* adjust_layer { */ + /* // ------------------------------------- ------------------------------------- */ + /* // | | LCL | MSU | RCL | MWU | | | MNX | MVD | MPL | MVU | MPV | | // TODO: once mouse keys exist */ + /* // | | MSL | MSD | MSR | MWD | USB | | LFT | DWN | UP | RGT | | | // TODO: once mouse keys exist */ + /* // |CONFG| BT1 | BT2 | BT3 | BT4 | BT5 | | | | | | | | */ + /* // ------------------| | | | | | | |------------------ */ + /* // ------------------- ------------------- */ + /* bindings = < */ + /* &trans &trans &trans &trans &trans &trans &kp C_NEXT &kp C_VOL_DN &kp K_PP &kp C_VOL_UP &kp C_PREV &trans */ + /* &trans &trans &trans &trans &trans &out USB &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans */ + /* &mo 4 &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans */ + /* &trans &trans &trans &trans &trans &trans */ + /* >; */ + /* }; */ config_layer { // ------------------------------------- ------------------------------------- // |BTCLR| | | | | | | | | | | | |