diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 26513d6..8b0f8f1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -23,13 +23,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ 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 81e8a12..d4ca77a 100644
--- a/.github/workflows/draw.yml
+++ b/.github/workflows/draw.yml
@@ -5,10 +5,11 @@ on:
workflow_dispatch: # can be triggered manually
push:
paths:
- - "config/*.keymap"
+ - "config/corneish_zen.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.
@@ -18,14 +19,14 @@ concurrency:
jobs:
draw:
- uses: minusfive/keymap-drawer/.github/workflows/draw-zmk.yml@main
+ uses: caksoylar/keymap-drawer/.github/workflows/draw-zmk.yml@main
permissions:
contents: write
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
+ keymap_patterns: "config/corneish_zen.keymap" # path to the keymaps to parse
+ 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
-
+ fail_on_error: true
diff --git a/.gitignore b/.gitignore
index 20354a8..3d758f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ modules/
tools/
.west/
.DS_Store
+.venv/
diff --git a/img/corne.svg b/img/corne.svg
deleted file mode 100644
index 65fec7d..0000000
--- a/img/corne.svg
+++ /dev/null
@@ -1,1237 +0,0 @@
-
diff --git a/img/corne.yaml b/img/corne.yaml
deleted file mode 100644
index 55683af..0000000
--- a/img/corne.yaml
+++ /dev/null
@@ -1,203 +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
- - R
- - S
- - T
- - G
- - M
- - N
- - E
- - I
- - O
- - {t: '$$mdi:keyboard-return$$', type: enter}
- - {t: Fn, h: '$$mdi:close-box$$'}
- - {t: Z, h: '$$mdi:apple-keyboard-control$$'}
- - {t: X, h: '$$mdi:apple-keyboard-option$$'}
- - {t: C, h: '$$mdi:apple-keyboard-command$$'}
- - {t: D, h: '$$mdi:star-three-points$$'}
- - V
- - K
- - {t: H, h: '$$mdi:star-three-points$$'}
- - {t: ',', h: '$$mdi:apple-keyboard-command$$', s: <}
- - {t: ., h: '$$mdi:apple-keyboard-option$$', s: '>'}
- - {t: /, h: '$$mdi:apple-keyboard-control$$', 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', s: '&'}
- - {t: '8', s: '*'}
- - {t: '9', s: (}
- - {t: '0', s: )}
- - $$mdi:arrow-left-bold$$
- - $$mdi:arrow-down-bold$$
- - $$mdi:arrow-up-bold$$
- - $$mdi:arrow-right-bold$$
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:apple-keyboard-control$$', h: '$$mdi:gesture-tap-hold$$'}
- - {t: '$$mdi:apple-keyboard-option$$', h: '$$mdi:gesture-tap-hold$$'}
- - {t: '$$mdi:apple-keyboard-command$$', h: '$$mdi:gesture-tap-hold$$'}
- - {t: '$$mdi:star-three-points$$', h: '$$mdi:gesture-tap-hold$$'}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:transfer$$', type: trans}
- - {t: '$$mdi:star-three-points$$', h: '$$mdi:gesture-tap-hold$$'}
- - {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}
- Fn:
- - {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
- - F7
- - F8
- - F9
- - F10
- - {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, Fn]
-- p: [8, 20]
- k: {h: '=', s: +}
- l: [L1, L2, Fn]
-- p: [9, 21]
- k: {h: ;, s: ':'}
- l: [L1, L2, Fn]
-- p: [19, 31]
- k: {h: '[', s: '{'}
- l: [L1, L2, Fn]
-- p: [20, 32]
- k: {h: ']', s: '}'}
- l: [L1, L2, Fn]
-- p: [21, 33]
- k: {h: \, s: '|'}
- l: [L1, L2, Fn]
-- p: [1, 2, 3, 4]
- k: $$mdi:bluetooth-off$$
- l: [Fn]
- a: top
- o: 0.03
-- p: [1, 13]
- k: {h: '1', s: '$$mdi:bluetooth-connect$$'}
- l: [Fn]
-- p: [2, 14]
- k: {h: '2', s: '$$mdi:bluetooth-connect$$'}
- l: [Fn]
-- p: [3, 15]
- k: {h: '3', s: '$$mdi:bluetooth-connect$$'}
- l: [Fn]
-- p: [4, 16]
- k: {h: '4', s: '$$mdi:bluetooth-connect$$'}
- l: [Fn]
-- p: [5, 17]
- k: {h: '5', s: '$$mdi:bluetooth-connect$$'}
- l: [Fn]
-- p: [6, 7]
- k: $$mdi:play-pause$$
- l: [L1, L2, Fn]
diff --git a/keymap_drawer.config.yaml b/keymap-drawer/config.yaml
similarity index 99%
rename from keymap_drawer.config.yaml
rename to keymap-drawer/config.yaml
index 34d9544..75a531c 100644
--- a/keymap_drawer.config.yaml
+++ b/keymap-drawer/config.yaml
@@ -281,6 +281,7 @@ draw_config:
.hold {
dominant-baseline: ideographic;
fill: var(--color--key--text--hold);
+ translate: -25px 4px;
}
/*
@@ -311,7 +312,7 @@ draw_config:
}
.combo.hold {
font-size: 16px;
- /* translate: 2px 0px; */
+ translate: 0 0;
}
/*
@@ -462,6 +463,10 @@ parse_config:
tap: $$mdi:backup-restore$$
"&bootloader":
tap: $$mdi:progress-download$$
+ "&rst_boot 0 0":
+ type: bootloader
+ tap: $$mdi:backup-restore$$
+ hold: $$mdi:progress-download$$
# ZMK
zmk_keycode_map:
@@ -608,14 +613,15 @@ parse_config:
RSHIFT: $$mdi:apple-keyboard-shift$$
RSHFT: $$mdi:apple-keyboard-shift$$
RCMD: $$mdi:apple-keyboard-command$$
- # "Meh" key
- LS(LC(LALT)): $$mdi:star-three-points$$
+ LS(LC(LALT)): $$mdi:triangle$$ # Meh
# Arrows
UP: $$mdi:arrow-up-bold$$
DOWN: $$mdi:arrow-down-bold$$
LEFT: $$mdi:arrow-left-bold$$
RIGHT: $$mdi:arrow-right-bold$$
+ PG_UP: $$mdi:transfer-up$$
+ PG_DN: $$mdi:transfer-down$$
# Whitespace
ENTER:
diff --git a/img/corneish_zen.svg b/keymap-drawer/corneish_zen.svg
similarity index 94%
rename from img/corneish_zen.svg
rename to keymap-drawer/corneish_zen.svg
index 65fec7d..a19381e 100644
--- a/img/corneish_zen.svg
+++ b/keymap-drawer/corneish_zen.svg
@@ -1,4 +1,4 @@
-