diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8f8ad2f..8b0f8f1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,11 +25,11 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
- uses: actions/configure-pages@v3
+ uses: actions/configure-pages@v5
- name: Upload artifact
- uses: actions/upload-pages-artifact@v2
+ uses: actions/upload-pages-artifact@v3
with:
path: "img/"
- name: Deploy to GitHub Pages
id: deployment
- uses: actions/deploy-pages@v2
+ uses: actions/deploy-pages@v4
diff --git a/.github/workflows/draw.yml b/.github/workflows/draw.yml
index ebd8aaf..2059b4a 100644
--- a/.github/workflows/draw.yml
+++ b/.github/workflows/draw.yml
@@ -8,7 +8,8 @@ on:
- "config/*.keymap"
- "config/*.dtsi"
- "knucklehead/*.dtsi"
- - "keymap_drawer.config.yaml"
+ - "keymap-drawer/config.yaml"
+ - ".github/workflows/draw.yml"
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
@@ -24,8 +25,8 @@ jobs:
with:
install_branch: "main" # branch to install keymap-drawer from
keymap_patterns: "config/*.keymap" # path to the keymaps to parse
- config_path: "keymap_drawer.config.yaml" # config file, ignored if not exists
- output_folder: "img" # path to save produced SVGs
+ config_path: "keymap-drawer/config.yaml" # config file, ignored if it doesn't exist
+ output_folder: "keymap-drawer" # path to save produced SVGs
# commit_message: "Draw: ${{ github.event.head_commit.message }}"
amend_commit: true # whether to amend the commit or create a new one
diff --git a/README.md b/README.md
index 093741d..17e5797 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Knucklehead is a mnemonic, macOS-optimized, 42[^1] key ergo columnar keyboard la
---
-
+
@@ -253,4 +253,5 @@ To locate your firmware files...
Your keyboard is now ready to use.
[^1]: Currently 42 keys because that's what I use, but honestly sometimes I feels like I have a few keys I don't know what to do with; though I often go back to re-adding them when I try removing them, so :shrug:. May make it work for other boards in the future, but may not be a priority for a while. No promises.
+
[^2]: Well, "designed" is perhaps too strong a word. I've haphazardly and painfully iterated over dozens of permutations, gradually removing annoyances / disruptions to my flow.
diff --git a/img/corne.svg b/img/corne.svg
deleted file mode 100644
index aef7b2d..0000000
--- a/img/corne.svg
+++ /dev/null
@@ -1,1281 +0,0 @@
-
diff --git a/img/corne.yaml b/img/corne.yaml
deleted file mode 100644
index 8b0ac43..0000000
--- a/img/corne.yaml
+++ /dev/null
@@ -1,209 +0,0 @@
-layout: {qmk_keyboard: corne_rotated, qmk_layout: LAYOUT_split_3x6_3}
-layers:
- L1:
- - $$mdi:keyboard-esc$$
- - Q
- - W
- - F
- - P
- - B
- - J
- - L
- - U
- - Y
- - {t: '''', s: '"'}
- - $$mdi:close-box$$
- - {t: '$$mdi:backspace$$', s: '$$mdi:backspace-reverse-outline$$', type: backspace}
- - A
- - {t: R, h: '$$mdi:apple-keyboard-control$$'}
- - {t: S, h: '$$mdi:apple-keyboard-option$$'}
- - {t: T, h: '$$mdi:apple-keyboard-command$$'}
- - {t: G, h: '$$mdi:star-three-points$$'}
- - {t: M, h: '$$mdi:star-three-points$$'}
- - {t: N, h: '$$mdi:apple-keyboard-command$$'}
- - {t: E, h: '$$mdi:apple-keyboard-option$$'}
- - {t: I, h: '$$mdi:apple-keyboard-control$$'}
- - O
- - {t: '$$mdi:keyboard-return$$', type: enter}
- - {t: Fn, h: '$$mdi:close-box$$'}
- - Z
- - X
- - C
- - D
- - V
- - K
- - H
- - {t: ',', s: <}
- - {t: ., s: '>'}
- - {t: /, s: '?'}
- - {t: Fn, h: '$$mdi:close-box$$'}
- - $$mdi:keyboard-tab$$
- - {t: '$$mdi:keyboard-space$$', h: '$$mdi:apple-keyboard-shift$$'}
- - {t: L2, h: '$$mdi:gesture-tap-hold$$', s: '$$mdi:alpha-w-box$$'}
- - {t: L2, h: '$$mdi:gesture-tap-hold$$', s: '$$mdi:alpha-w-box$$'}
- - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:gesture-tap-hold$$', s: '$$mdi:alpha-w-box$$'}
- - {t: '`', s: '~'}
- L2:
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '1', s: '!'}
- - {t: '2', s: '@'}
- - {t: '3', s: '#'}
- - {t: '4', s: $}
- - {t: '5', s: '%'}
- - $$mdi:skip-previous$$
- - $$mdi:volume-low$$
- - $$mdi:volume-high$$
- - $$mdi:skip-next$$
- - $$mdi:volume-off$$
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '6', s: ^}
- - {t: '7', h: '$$mdi:apple-keyboard-control$$', s: '&'}
- - {t: '8', h: '$$mdi:apple-keyboard-option$$', s: '*'}
- - {t: '9', h: '$$mdi:apple-keyboard-command$$', s: (}
- - {t: '0', h: '$$mdi:star-three-points$$', s: )}
- - {t: '$$mdi:arrow-left-bold$$', h: '$$mdi:star-three-points$$'}
- - {t: '$$mdi:arrow-down-bold$$', h: '$$mdi:apple-keyboard-command$$'}
- - {t: '$$mdi:arrow-up-bold$$', h: '$$mdi:apple-keyboard-option$$'}
- - {t: '$$mdi:arrow-right-bold$$', h: '$$mdi:apple-keyboard-control$$'}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:close-box$$', h: L2}
- - {t: '$$mdi:close-box$$', h: L2}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- L3:
- - {t: '$$mdi:toggle-switch$$', h: '$$mdi:bluetooth$$', s: '$$mdi:usb$$'}
- - F1
- - F2
- - F3
- - F4
- - F5
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - $$mdi:power-standby$$
- - {t: '$$mdi:backup-restore$$', type: bootloader}
- - F6
- - {t: F7, h: '$$mdi:apple-keyboard-control$$'}
- - {t: F8, h: '$$mdi:apple-keyboard-option$$'}
- - {t: F9, h: '$$mdi:apple-keyboard-command$$'}
- - {t: F10, h: '$$mdi:star-three-points$$'}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:backup-restore$$', type: bootloader}
- - {t: '$$mdi:close-box$$', h: Fn}
- - F11
- - F12
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - $$mdi:progress-download$$
- - $$mdi:progress-download$$
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:close-box$$', h: Fn}
- - $$mdi:brightness-7$$
- - $$mdi:brightness-5$$
- - {t: '$$mdi:close-box$$', h: L2}
- - {t: '$$mdi:close-box$$', h: L2}
- - $$mdi:apple-keyboard-caps$$
- - {t: '$$mdi:transfer$$', type: trans}
-combos:
-- p: [1, 13]
- k: '!'
- l: [L1, L2]
-- p: [2, 14]
- k: '@'
- l: [L1, L2]
-- p: [3, 15]
- k: '#'
- l: [L1, L2]
-- p: [4, 16]
- k: $
- l: [L1, L2]
-- p: [5, 17]
- k: '%'
- l: [L1, L2]
-- p: [13, 25]
- k: ^
- l: [L1, L2]
-- p: [14, 26]
- k: '&'
- l: [L1, L2]
-- p: [15, 27]
- k: '*'
- l: [L1, L2]
-- p: [16, 28]
- k: (
- l: [L1, L2]
-- p: [17, 29]
- k: )
- l: [L1, L2]
-- p: [7, 19]
- k: {h: '-', s: _}
- l: [L1, L2, L3]
-- p: [8, 20]
- k: {h: '=', s: +}
- l: [L1, L2, L3]
-- p: [9, 21]
- k: {h: ;, s: ':'}
- l: [L1, L2, L3]
-- p: [6, 18]
- k: $$mdi:transfer-up$$
- l: [L1, L2, L3]
-- p: [18, 30]
- k: $$mdi:transfer-down$$
- l: [L1, L2, L3]
-- p: [19, 31]
- k: {h: '[', s: '{'}
- l: [L1, L2, L3]
-- p: [20, 32]
- k: {h: ']', s: '}'}
- l: [L1, L2, L3]
-- p: [21, 33]
- k: {h: \, s: '|'}
- l: [L1, L2, L3]
-- p: [1, 2, 3, 4]
- k: $$mdi:bluetooth-off$$
- l: [L3]
- a: top
- o: 0.03
-- p: [1, 13]
- k: {h: '1', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [2, 14]
- k: {h: '2', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [3, 15]
- k: {h: '3', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [4, 16]
- k: {h: '4', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [5, 17]
- k: {h: '5', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [6, 7]
- k: $$mdi:play-pause$$
- l: [L1, L2, L3]
diff --git a/img/corneish_zen.svg b/img/corneish_zen.svg
deleted file mode 100644
index aef7b2d..0000000
--- a/img/corneish_zen.svg
+++ /dev/null
@@ -1,1281 +0,0 @@
-
diff --git a/img/corneish_zen.yaml b/img/corneish_zen.yaml
deleted file mode 100644
index 8b0ac43..0000000
--- a/img/corneish_zen.yaml
+++ /dev/null
@@ -1,209 +0,0 @@
-layout: {qmk_keyboard: corne_rotated, qmk_layout: LAYOUT_split_3x6_3}
-layers:
- L1:
- - $$mdi:keyboard-esc$$
- - Q
- - W
- - F
- - P
- - B
- - J
- - L
- - U
- - Y
- - {t: '''', s: '"'}
- - $$mdi:close-box$$
- - {t: '$$mdi:backspace$$', s: '$$mdi:backspace-reverse-outline$$', type: backspace}
- - A
- - {t: R, h: '$$mdi:apple-keyboard-control$$'}
- - {t: S, h: '$$mdi:apple-keyboard-option$$'}
- - {t: T, h: '$$mdi:apple-keyboard-command$$'}
- - {t: G, h: '$$mdi:star-three-points$$'}
- - {t: M, h: '$$mdi:star-three-points$$'}
- - {t: N, h: '$$mdi:apple-keyboard-command$$'}
- - {t: E, h: '$$mdi:apple-keyboard-option$$'}
- - {t: I, h: '$$mdi:apple-keyboard-control$$'}
- - O
- - {t: '$$mdi:keyboard-return$$', type: enter}
- - {t: Fn, h: '$$mdi:close-box$$'}
- - Z
- - X
- - C
- - D
- - V
- - K
- - H
- - {t: ',', s: <}
- - {t: ., s: '>'}
- - {t: /, s: '?'}
- - {t: Fn, h: '$$mdi:close-box$$'}
- - $$mdi:keyboard-tab$$
- - {t: '$$mdi:keyboard-space$$', h: '$$mdi:apple-keyboard-shift$$'}
- - {t: L2, h: '$$mdi:gesture-tap-hold$$', s: '$$mdi:alpha-w-box$$'}
- - {t: L2, h: '$$mdi:gesture-tap-hold$$', s: '$$mdi:alpha-w-box$$'}
- - {t: '$$mdi:apple-keyboard-shift$$', h: '$$mdi:gesture-tap-hold$$', s: '$$mdi:alpha-w-box$$'}
- - {t: '`', s: '~'}
- L2:
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '1', s: '!'}
- - {t: '2', s: '@'}
- - {t: '3', s: '#'}
- - {t: '4', s: $}
- - {t: '5', s: '%'}
- - $$mdi:skip-previous$$
- - $$mdi:volume-low$$
- - $$mdi:volume-high$$
- - $$mdi:skip-next$$
- - $$mdi:volume-off$$
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '6', s: ^}
- - {t: '7', h: '$$mdi:apple-keyboard-control$$', s: '&'}
- - {t: '8', h: '$$mdi:apple-keyboard-option$$', s: '*'}
- - {t: '9', h: '$$mdi:apple-keyboard-command$$', s: (}
- - {t: '0', h: '$$mdi:star-three-points$$', s: )}
- - {t: '$$mdi:arrow-left-bold$$', h: '$$mdi:star-three-points$$'}
- - {t: '$$mdi:arrow-down-bold$$', h: '$$mdi:apple-keyboard-command$$'}
- - {t: '$$mdi:arrow-up-bold$$', h: '$$mdi:apple-keyboard-option$$'}
- - {t: '$$mdi:arrow-right-bold$$', h: '$$mdi:apple-keyboard-control$$'}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:close-box$$', h: L2}
- - {t: '$$mdi:close-box$$', h: L2}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- L3:
- - {t: '$$mdi:toggle-switch$$', h: '$$mdi:bluetooth$$', s: '$$mdi:usb$$'}
- - F1
- - F2
- - F3
- - F4
- - F5
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - $$mdi:power-standby$$
- - {t: '$$mdi:backup-restore$$', type: bootloader}
- - F6
- - {t: F7, h: '$$mdi:apple-keyboard-control$$'}
- - {t: F8, h: '$$mdi:apple-keyboard-option$$'}
- - {t: F9, h: '$$mdi:apple-keyboard-command$$'}
- - {t: F10, h: '$$mdi:star-three-points$$'}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:backup-restore$$', type: bootloader}
- - {t: '$$mdi:close-box$$', h: Fn}
- - F11
- - F12
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - $$mdi:progress-download$$
- - $$mdi:progress-download$$
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:close-box$$', h: Fn}
- - $$mdi:brightness-7$$
- - $$mdi:brightness-5$$
- - {t: '$$mdi:close-box$$', h: L2}
- - {t: '$$mdi:close-box$$', h: L2}
- - $$mdi:apple-keyboard-caps$$
- - {t: '$$mdi:transfer$$', type: trans}
-combos:
-- p: [1, 13]
- k: '!'
- l: [L1, L2]
-- p: [2, 14]
- k: '@'
- l: [L1, L2]
-- p: [3, 15]
- k: '#'
- l: [L1, L2]
-- p: [4, 16]
- k: $
- l: [L1, L2]
-- p: [5, 17]
- k: '%'
- l: [L1, L2]
-- p: [13, 25]
- k: ^
- l: [L1, L2]
-- p: [14, 26]
- k: '&'
- l: [L1, L2]
-- p: [15, 27]
- k: '*'
- l: [L1, L2]
-- p: [16, 28]
- k: (
- l: [L1, L2]
-- p: [17, 29]
- k: )
- l: [L1, L2]
-- p: [7, 19]
- k: {h: '-', s: _}
- l: [L1, L2, L3]
-- p: [8, 20]
- k: {h: '=', s: +}
- l: [L1, L2, L3]
-- p: [9, 21]
- k: {h: ;, s: ':'}
- l: [L1, L2, L3]
-- p: [6, 18]
- k: $$mdi:transfer-up$$
- l: [L1, L2, L3]
-- p: [18, 30]
- k: $$mdi:transfer-down$$
- l: [L1, L2, L3]
-- p: [19, 31]
- k: {h: '[', s: '{'}
- l: [L1, L2, L3]
-- p: [20, 32]
- k: {h: ']', s: '}'}
- l: [L1, L2, L3]
-- p: [21, 33]
- k: {h: \, s: '|'}
- l: [L1, L2, L3]
-- p: [1, 2, 3, 4]
- k: $$mdi:bluetooth-off$$
- l: [L3]
- a: top
- o: 0.03
-- p: [1, 13]
- k: {h: '1', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [2, 14]
- k: {h: '2', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [3, 15]
- k: {h: '3', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [4, 16]
- k: {h: '4', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [5, 17]
- k: {h: '5', s: '$$mdi:bluetooth-connect$$'}
- l: [L3]
-- p: [6, 7]
- k: $$mdi:play-pause$$
- l: [L1, L2, L3]
diff --git a/keymap_drawer.config.yaml b/keymap-drawer/config.yaml
similarity index 100%
rename from keymap_drawer.config.yaml
rename to keymap-drawer/config.yaml
diff --git a/scripts/draw.sh b/scripts/draw.sh
index 212d3e5..1b80288 100755
--- a/scripts/draw.sh
+++ b/scripts/draw.sh
@@ -1,4 +1,4 @@
#!/bin/sh
-keymap -c ./keymap_drawer.config.yaml parse -z ./config/${1}.keymap >./img/${1}.yaml
-keymap -c ./keymap_drawer.config.yaml draw ./img/${1}.yaml >./img/${1}.svg
+keymap -c ./keymap-drawer/config.yaml parse -z ./config/${1}.keymap >./keymap-drawer/${1}.yaml
+keymap -c ./keymap-drawer/config.yaml draw ./img/${1}.yaml >./keymap-drawer/${1}.svg