diff --git a/.gitignore b/.gitignore index b91777e..36f8930 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ /.direnv /result + +/modules +/zephyr +/zmk +/zmk-helpers +/.west diff --git a/config/cradio.keymap b/config/cradio.keymap index c7928a8..a5471c1 100644 --- a/config/cradio.keymap +++ b/config/cradio.keymap @@ -207,13 +207,13 @@ bindings = < //╭──────────┬──────────┬──────────┬──────────┬──────────╮ ╭──────────┬──────────┬──────────┬──────────┬──────────╮ //│ ESCAPE │ MUTE │ VOL DOWN │ VOL UP │ │ │ │ HOME │ UP │ END │ │ - &kp ESC &kp C_MUTE &kp VOL_DN &kp VOL_UP &none &none &kp HOME &kp UP &kp END &one + &kp ESC &kp C_MUTE &kp VOL_DN &kp VOL_UP &none &none &kp HOME &kp UP &kp END &none //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ //│ SHIFT │ CMD │ ALT │ CTRL │ TAB │ │ BACKSPACE│ LEFT │ ENTER │ RIGHT │ DEL │ &sk LSHFT &sk LCMD &sk LALT &sk LCTRL &kp TAB &kp BSPC &kp LEFT &kp ENTER &kp RIGHT &kp DEL //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ //│ │ PLAY │ PREVIOUS │ NEXT │ │ │ │ PG_UP │ DOWN │ PG DOWN │ END │ - &none &kp C_PP &kp C_PREV &kp C_NEXT &none &none &kp PG_UP &kp DOWN &kp PG_DOWN &kp END + &none &kp C_PP &kp C_PREV &kp C_NEXT &none &none &kp PG_UP &kp DOWN &kp PG_DN &kp END //╰──────────┴──────────┴──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┴──────────┴──────────╯ &trans &trans &trans &trans // ╰──────────┴──────────╯ ╰──────────┴──────────╯ @@ -227,7 +227,7 @@ &kp SLASH &kp N7 &kp N8 &kp N9 &kp STAR &bts 0 &bts 1 &bts 2 &bts 3 &bts 4 //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ //│ - │ 4 │ 5 │ 6 │ + │ │ = │ CTRL │ ALT │ CMD │ SHIFT │ - &kp MINUS &kp N4 &kp N5 &kp N6 &kp PLUS &kp EQL &sk LCTRL &sk LALT &sk LCMD &sk LSHFT + &kp MINUS &kp N4 &kp N5 &kp N6 &kp PLUS &kp EQUAL &sk LCTRL &sk LALT &sk LCMD &sk LSHFT //├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤ //│ │ 1 │ 2 │ 3 │ 0 │ │ │ │ │ │ │ &trans &kp N1 &kp N2 &kp N3 &kp N0 &trans &trans &bt BT_NXT &bt BT_PRV &bt BT_CLR diff --git a/keymap-drawer/cradio.svg b/keymap-drawer/cradio.svg index b08d933..adaec38 100644 --- a/keymap-drawer/cradio.svg +++ b/keymap-drawer/cradio.svg @@ -658,7 +658,6 @@ rect.held, rect.combo.held { -&one @@ -757,7 +756,7 @@ rect.held, rect.combo.held { -PGDOWN +PageDown @@ -872,7 +871,7 @@ rect.held, rect.combo.held { -EQL += diff --git a/keymap-drawer/cradio.yaml b/keymap-drawer/cradio.yaml index 4b97bcf..98501f5 100644 --- a/keymap-drawer/cradio.yaml +++ b/keymap-drawer/cradio.yaml @@ -80,7 +80,7 @@ layers: - HOME - $$mdi:arrow-up$$ - END - - '&one' + - '' - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:circle-small$$'} - {t: '$$mdi:apple-keyboard-command$$', h: '$$mdi:circle-small$$'} - {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'} @@ -99,7 +99,7 @@ layers: - '' - Page Up - $$mdi:arrow-down$$ - - PG DOWN + - Page Down - END - {type: held} - {t: '$$mdi:chevron-down$$', type: trans} @@ -121,7 +121,7 @@ layers: - '5' - '6' - + - - EQL + - '=' - {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:circle-small$$'} - {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:circle-small$$'} - {t: '$$mdi:apple-keyboard-command$$', h: '$$mdi:circle-small$$'} diff --git a/mise.toml b/mise.toml new file mode 100644 index 0000000..f514c5a --- /dev/null +++ b/mise.toml @@ -0,0 +1,17 @@ +[tools] +cmake = "latest" +pipx = "latest" +"pipx:west" = "latest" +python = "latest" + +[tasks.setup] +run = [ + "west init -l app/ --mf {{config_root}}/config/west.yml", + "west update", + "west zephyr-export" +] + +[tasks.build] +# Not working yet... +run = "west build -b nice_nano_v2 -- -DZMK_CONFIG=\"{{config_root}}/config\"" +dir = "zmk/app"