commit d3bec43c97c99113745dca19a822e458d2ed0ee7
parent d2ad968fbf55fe8f47b082815718d04ec4649476
Author: Jack Sangdahl <jack@pngu.org>
Date: Sun, 14 Dec 2025 20:17:29 -0700
Update layout diagram
Diffstat:
2 files changed, 55 insertions(+), 48 deletions(-)
diff --git a/util/keymap.yaml b/util/keymap.yaml
@@ -3,67 +3,66 @@ layout:
layout_name: LAYOUT_split_3x5_3
layers:
LAYER0:
- - [Q, W, E, R, T, Y, U, I, O, P]
+ - ["Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P"]
- [
- {h: $$mdi:apple-keyboard-option$$, t: A},
- {h: $$mdi:apple-keyboard-command$$, t: S},
- {h: $$mdi:apple-keyboard-control$$, t: D},
- {h: $$mdi:apple-keyboard-shift$$, t: F},
- G, H,
- {h: $$mdi:apple-keyboard-shift$$, t: J},
- {h: $$mdi:apple-keyboard-control$$, t: K},
- {h: $$mdi:apple-keyboard-command$$, t: L},
- {h: $$mdi:apple-keyboard-option$$, t: ;}
+ {h: $$mdi:apple-keyboard-option$$, t: "A"},
+ {h: $$mdi:apple-keyboard-command$$, t: "S"},
+ {h: $$mdi:apple-keyboard-control$$, t: "D"},
+ {h: $$mdi:apple-keyboard-shift$$, t: "F"},
+ "G", "H",
+ {h: $$mdi:apple-keyboard-shift$$, t: "J"},
+ {h: $$mdi:apple-keyboard-control$$, t: "K"},
+ {h: $$mdi:apple-keyboard-command$$, t: "L"},
+ {h: $$mdi:apple-keyboard-option$$, t: ";"}
]
- - [Z, X, C, V, B, N, M, ",", ., "'"]
+ - ["Z", "X", "C", "V", "B", "N", "M", ",", ".", "'"]
- {type: ghost}
- - {h: L1, t: Esc, type: held}
+ - {h: "L1", t: "Esc", type: held}
- {t: $$mdi:keyboard-space$$ }
- {t: $$mdi:backspace-outline$$}
- - {h: L2, t: "Repeat", type: held}
+ - {h: "L2", t: "_", type: held}
- {type: ghost}
LAYER1:
- - [1,2,3,4,5,6,7,8,9,0]
- - ["+", "-", "*", "/", "Remove", $$mdi:arrow-left$$, $$mdi:arrow-down$$, $$mdi:arrow-up$$, $$mdi:arrow-right$$, null]
+ - ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"]
+ - ["/", "*", "-", "+", $$mdi:keyboard-tab$$, $$mdi:arrow-left$$, $$mdi:arrow-down$$, $$mdi:arrow-up$$, $$mdi:arrow-right$$, $$mdi:apple-keyboard-caps$$]
- [
$$mdi:volume-minus$$,
$$mdi:play-pause$$,
- $$mdi:volume-plus$$,
- "../",
- "User Name",
- null,
+ $$mdi:trash-can-outline$$,
+ $$mdi:folder-arrow-left-outline$$,
+ $$mdi:account$$,
null,
null,
null,
null,
+ $$mdi:volume-plus$$
]
- {type: ghost}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
- {type: ghost}
LAYER2:
- ["`", "<", ">", "-", "|", "^", "{", "}", "$", "\\"]
- ["!", "*", "/", "=", "&", "#", "(", ")", ";", "\""]
- ["~", "+", "[", "]", "%", "@", ":", ",", ".", "'"]
- {type: ghost}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
- {type: ghost}
LAYER3:
- ["Mode +", "Hue +", "Sat +", "Val +", "RGB Togg", null, null, null, null, "QK Cmpl"]
- ["Mode -", "Hue -", "Sat -", "Val -", null, null, null, null, null, "QK Boot"]
- - [F1, F2, F3, F4, F5, F6, F7, F8, F9, F10]
+ - ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10"]
- {type: ghost}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
- - {t: ▽, type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
+ - {t: "▽", type: trans}
- {type: ghost}
combos:
- {p: [16, 17], k: $$mdi:keyboard-return$$, l: ["LAYER0"]}
- - {p: [12, 13], k: $$mdi:apple-keyboard-caps$$, l: ["LAYER0"]}
- {p: [13, 16], k: "Cap Wrd", l: ["LAYER0"], align: top, offset: 0.1}
diff --git a/util/layout.svg b/util/layout.svg
@@ -1,5 +1,8 @@
<svg width="788" height="1379" viewBox="0 0 788 1379" class="keymap" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>/* start glyphs */
+<svg id="mdi:account">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-account" viewBox="0 0 24 24"><path d="M12,4A4,4 0 0,1 16,8A4,4 0 0,1 12,12A4,4 0 0,1 8,8A4,4 0 0,1 12,4M12,14C16.42,14 20,15.79 20,18V20H4V18C4,15.79 7.58,14 12,14Z" /></svg>
+</svg>
<svg id="mdi:apple-keyboard-caps">
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-apple-keyboard-caps" viewBox="0 0 24 24"><path d="M15,14V8H17.17L12,2.83L6.83,8H9V14H15M12,0L22,10H17V16H7V10H2L12,0M7,18H17V24H7V18M15,20H9V22H15V20Z" /></svg>
</svg>
@@ -30,15 +33,24 @@
<svg id="mdi:backspace-outline">
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-backspace-outline" viewBox="0 0 24 24"><path d="M19,15.59L17.59,17L14,13.41L10.41,17L9,15.59L12.59,12L9,8.41L10.41,7L14,10.59L17.59,7L19,8.41L15.41,12L19,15.59M22,3A2,2 0 0,1 24,5V19A2,2 0 0,1 22,21H7C6.31,21 5.77,20.64 5.41,20.11L0,12L5.41,3.88C5.77,3.35 6.31,3 7,3H22M22,5H7L2.28,12L7,19H22V5Z" /></svg>
</svg>
+<svg id="mdi:folder-arrow-left-outline">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-folder-arrow-left-outline" viewBox="0 0 24 24"><path d="M22 8V13.81C21.39 13.46 20.72 13.22 20 13.09V8H4V18H13.09C13.04 18.33 13 18.66 13 19C13 19.34 13.04 19.67 13.09 20H4C2.9 20 2 19.11 2 18V6C2 4.89 2.89 4 4 4H10L12 6H20C21.1 6 22 6.89 22 8M18 16L15 19L18 22V20H22V18H18V16Z" /></svg>
+</svg>
<svg id="mdi:keyboard-return">
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-return" viewBox="0 0 24 24"><path d="M19,7V11H5.83L9.41,7.41L8,6L2,12L8,18L9.41,16.58L5.83,13H21V7H19Z" /></svg>
</svg>
<svg id="mdi:keyboard-space">
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-space" viewBox="0 0 24 24"><path d="M3 15H5V19H19V15H21V19C21 20.1 20.1 21 19 21H5C3.9 21 3 20.1 3 19V15Z" /></svg>
</svg>
+<svg id="mdi:keyboard-tab">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-keyboard-tab" viewBox="0 0 24 24"><path d="M20,18H22V6H20M11.59,7.41L15.17,11H1V13H15.17L11.59,16.58L13,18L19,12L13,6L11.59,7.41Z" /></svg>
+</svg>
<svg id="mdi:play-pause">
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-play-pause" viewBox="0 0 24 24"><path d="M3,5V19L11,12M13,19H16V5H13M18,5V19H21V5" /></svg>
</svg>
+<svg id="mdi:trash-can-outline">
+<svg xmlns="http://www.w3.org/2000/svg" id="mdi-trash-can-outline" viewBox="0 0 24 24"><path d="M9,3V4H4V6H5V19A2,2 0 0,0 7,21H17A2,2 0 0,0 19,19V6H20V4H15V3H9M7,6H17V19H7V6M9,8V17H11V8H9M13,8V17H15V8H13Z" /></svg>
+</svg>
<svg id="mdi:volume-minus">
<svg xmlns="http://www.w3.org/2000/svg" id="mdi-volume-minus" viewBox="0 0 24 24"><path d="M3,9H7L12,4V20L7,15H3V9M14,11H22V13H14V11Z" /></svg>
</svg>
@@ -320,7 +332,7 @@ path.combo {
</g>
<g transform="translate(498, 213) rotate(-15.0)" class="key held keypos-34">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key held"/>
-<text x="0" y="0" class="key held tap">Repeat</text>
+<text x="0" y="0" class="key held tap">_</text>
<text x="0" y="24" class="key held hold">L2</text>
</g>
<g transform="translate(560, 205)" class="key ghost keypos-35">
@@ -331,10 +343,6 @@ path.combo {
<use href="#mdi:keyboard-return" xlink:href="#mdi:keyboard-return" x="553" y="80" height="14" width="14.0" class="combo tap glyph mdi:keyboard-return"/>
</g>
<g class="combo combopos-1">
-<rect rx="6" ry="6" x="154" y="74" width="28" height="26" class="combo"/>
-<use href="#mdi:apple-keyboard-caps" xlink:href="#mdi:apple-keyboard-caps" x="161" y="80" height="14" width="14.0" class="combo tap glyph mdi:apple-keyboard-caps"/>
-</g>
-<g class="combo combopos-2">
<path d="M364,56 h-162 a6.0,6.0 0 0 0 -6.0,6.0 v10" class="combo"/>
<path d="M364,56 h162 a6.0,6.0 0 0 1 6.0,6.0 v10" class="combo"/>
<rect rx="6" ry="6" x="350" y="43" width="28" height="26" class="combo"/>
@@ -389,23 +397,23 @@ path.combo {
</g>
<g transform="translate(28, 105)" class="key keypos-10">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">+</text>
+<text x="0" y="0" class="key tap">/</text>
</g>
<g transform="translate(84, 91)" class="key keypos-11">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">-</text>
+<text x="0" y="0" class="key tap">*</text>
</g>
<g transform="translate(140, 84)" class="key keypos-12">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">*</text>
+<text x="0" y="0" class="key tap">-</text>
</g>
<g transform="translate(196, 91)" class="key keypos-13">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">/</text>
+<text x="0" y="0" class="key tap">+</text>
</g>
<g transform="translate(252, 98)" class="key keypos-14">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">Remove</text>
+<use href="#mdi:keyboard-tab" xlink:href="#mdi:keyboard-tab" x="-7" y="-7" height="14" width="14.0" class="key tap glyph mdi:keyboard-tab"/>
</g>
<g transform="translate(476, 98)" class="key keypos-15">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -425,6 +433,7 @@ path.combo {
</g>
<g transform="translate(700, 105)" class="key keypos-19">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<use href="#mdi:apple-keyboard-caps" xlink:href="#mdi:apple-keyboard-caps" x="-7" y="-7" height="14" width="14.0" class="key tap glyph mdi:apple-keyboard-caps"/>
</g>
<g transform="translate(28, 161)" class="key keypos-20">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -436,17 +445,15 @@ path.combo {
</g>
<g transform="translate(140, 140)" class="key keypos-22">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<use href="#mdi:volume-plus" xlink:href="#mdi:volume-plus" x="-7" y="-7" height="14" width="14.0" class="key tap glyph mdi:volume-plus"/>
+<use href="#mdi:trash-can-outline" xlink:href="#mdi:trash-can-outline" x="-7" y="-7" height="14" width="14.0" class="key tap glyph mdi:trash-can-outline"/>
</g>
<g transform="translate(196, 147)" class="key keypos-23">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">../</text>
+<use href="#mdi:folder-arrow-left-outline" xlink:href="#mdi:folder-arrow-left-outline" x="-7" y="-7" height="14" width="14.0" class="key tap glyph mdi:folder-arrow-left-outline"/>
</g>
<g transform="translate(252, 154)" class="key keypos-24">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
-<text x="0" y="0" class="key tap">
-<tspan x="0" dy="-0.6em">User</tspan><tspan x="0" dy="1.2em">Name</tspan>
-</text>
+<use href="#mdi:account" xlink:href="#mdi:account" x="-7" y="-7" height="14" width="14.0" class="key tap glyph mdi:account"/>
</g>
<g transform="translate(476, 154)" class="key keypos-25">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
@@ -462,6 +469,7 @@ path.combo {
</g>
<g transform="translate(700, 161)" class="key keypos-29">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key"/>
+<use href="#mdi:volume-plus" xlink:href="#mdi:volume-plus" x="-7" y="-7" height="14" width="14.0" class="key tap glyph mdi:volume-plus"/>
</g>
<g transform="translate(168, 205)" class="key ghost keypos-30">
<rect rx="6" ry="6" x="-26" y="-26" width="52" height="52" class="key ghost"/>
