Compare commits

..

No commits in common. "a882a2697a2065bea0fc059b037a05d16f303a04" and "07d5f9e79c9dea25d49c0f011a42ee9f9c88f14e" have entirely different histories.

5 changed files with 9 additions and 31 deletions

6
.gitignore vendored
View file

@ -1,8 +1,2 @@
/.direnv
/result
/modules
/zephyr
/zmk
/zmk-helpers
/.west

View file

@ -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 &none
&kp ESC &kp C_MUTE &kp VOL_DN &kp VOL_UP &none &none &kp HOME &kp UP &kp END &one
//├──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┤
//│ 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_DN &kp END
&none &kp C_PP &kp C_PREV &kp C_NEXT &none &none &kp PG_UP &kp DOWN &kp PG_DOWN &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 EQUAL &sk LCTRL &sk LALT &sk LCMD &sk LSHFT
&kp MINUS &kp N4 &kp N5 &kp N6 &kp PLUS &kp EQL &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

View file

@ -658,6 +658,7 @@ rect.held, rect.combo.held {
<g transform="translate(644, 81)" class="key keypos-9">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
<rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
<text x="0" y="-4" class="key tap">&amp;one</text>
</g>
<g transform="translate(28, 137)" class="key keypos-10">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
@ -756,7 +757,7 @@ rect.held, rect.combo.held {
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
<rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
<text x="0" y="-4" class="key tap">
<tspan x="0" dy="-0.6em">Page</tspan><tspan x="0" dy="1.2em">Down</tspan>
<tspan x="0" dy="-0.6em">PG</tspan><tspan x="0" dy="1.2em">DOWN</tspan>
</text>
</g>
<g transform="translate(644, 193)" class="key keypos-29">
@ -871,7 +872,7 @@ rect.held, rect.combo.held {
<g transform="translate(420, 108)" class="key keypos-15">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>
<rect rx="4" ry="4" x="-20" y="-24" width="40" height="40" class="key"/>
<text x="0" y="-4" class="key tap">=</text>
<text x="0" y="-4" class="key tap">EQL</text>
</g>
<g transform="translate(476, 100)" class="key keypos-16">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key side"/>

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 121 KiB

Before After
Before After

View file

@ -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$$
- Page Down
- PG 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$$'}

View file

@ -1,17 +0,0 @@
[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"