From c0f8e46f3395a206d68d75cf367f765035721356 Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Sun, 17 Dec 2023 15:42:14 -0500 Subject: [PATCH 01/10] feat: add tmux keybinds --- config/base_lower.keymap | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/config/base_lower.keymap b/config/base_lower.keymap index 72222ae..210427e 100644 --- a/config/base_lower.keymap +++ b/config/base_lower.keymap @@ -29,6 +29,26 @@ / { + ZMK_MACRO(trw, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp COMMA>;) + + ZMK_MACRO(trs, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp DLLR>;) + + ZMK_MACRO(tfs, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp LC(J)>;) + + ZMK_MACRO(tfp, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp LC(G)>;) + ZMK_MACRO(tpr, wait-ms = <30>; tap-ms = <40>; @@ -198,9 +218,9 @@ label = "Tmux"; bindings = < // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ - &none &none &none &none &tsnext &none &twnext &none - &none &none &none &none &none &tsprev &tpl &thumbs &tpr &none - &none &none &none &none &none &twprev &none &none + &none &none &none &none &tsnext &trw &twnext &trs + &none &none &none &none &none &tsprev &tpl &thumbs &tpr &tfs + &none &none &none &none &none &twprev &none &tfp // ╰─────────────┴─────────────┴─────────────╮ ╭─────────────┴─────────────┴─────────────╯ &tsh &tsv &twin &tsess // ╰─────────────┴─────────────╯ ╰─────────────┴───────────── From b7ad59cf8349958f19e8b605051ae5cbe0803935 Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Tue, 19 Dec 2023 13:30:02 -0500 Subject: [PATCH 02/10] feat: add more tmux keybinds --- config/base_lower.keymap | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/config/base_lower.keymap b/config/base_lower.keymap index 210427e..628b684 100644 --- a/config/base_lower.keymap +++ b/config/base_lower.keymap @@ -29,6 +29,21 @@ / { + ZMK_MACRO(tpb, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp EQUAL>;) + + ZMK_MACRO(tp, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp RBKT>;) + + ZMK_MACRO(tcm, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp LBKT>;) + ZMK_MACRO(trw, wait-ms = <30>; tap-ms = <40>; @@ -52,12 +67,22 @@ ZMK_MACRO(tpr, wait-ms = <30>; tap-ms = <40>; - bindings = <&kp LC(B) &kp RARW>;) + bindings = <&kp LC(B) &kp H>;) ZMK_MACRO(tpl, wait-ms = <30>; tap-ms = <40>; - bindings = <&kp LC(B) &kp LARW>;) + bindings = <&kp LC(B) &kp L>;) + + ZMK_MACRO(tpd, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp J>;) + + ZMK_MACRO(tpu, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp K>;) ZMK_MACRO(tsh, wait-ms = <30>; @@ -218,9 +243,9 @@ label = "Tmux"; bindings = < // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ - &none &none &none &none &tsnext &trw &twnext &trs - &none &none &none &none &none &tsprev &tpl &thumbs &tpr &tfs - &none &none &none &none &none &twprev &none &tfp + &none &none &none &none &tsnext &twprev &thumbs &twnext + &none &none &none &none &none &tsprev &tpl &tpd &tpu &tfr + &none &none &none &none &tcm &tp &tpb &none // ╰─────────────┴─────────────┴─────────────╮ ╭─────────────┴─────────────┴─────────────╯ &tsh &tsv &twin &tsess // ╰─────────────┴─────────────╯ ╰─────────────┴───────────── From 0d4396e05b2d4cdb035126bcee6911927bb431f6 Mon Sep 17 00:00:00 2001 From: Glen Goodwin Date: Wed, 20 Dec 2023 20:28:04 -0500 Subject: [PATCH 03/10] fix: tmux error --- config/base_lower.keymap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/base_lower.keymap b/config/base_lower.keymap index 628b684..e5394ab 100644 --- a/config/base_lower.keymap +++ b/config/base_lower.keymap @@ -244,8 +244,8 @@ bindings = < // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ &none &none &none &none &tsnext &twprev &thumbs &twnext - &none &none &none &none &none &tsprev &tpl &tpd &tpu &tfr - &none &none &none &none &tcm &tp &tpb &none + &none &none &none &none &none &tsprev &tpl &tpd &tpu &tpr + &none &none &none &none &tcm &tp &none &none // ╰─────────────┴─────────────┴─────────────╮ ╭─────────────┴─────────────┴─────────────╯ &tsh &tsv &twin &tsess // ╰─────────────┴─────────────╯ ╰─────────────┴───────────── From b64cd1bd96a689b97e7f9d3e71d7a68243829227 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Fri, 5 Jan 2024 16:53:43 -0500 Subject: [PATCH 04/10] chore: fix spacing --- config/base_lower.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/base_lower.keymap b/config/base_lower.keymap index e5394ab..02a6521 100644 --- a/config/base_lower.keymap +++ b/config/base_lower.keymap @@ -247,7 +247,7 @@ &none &none &none &none &none &tsprev &tpl &tpd &tpu &tpr &none &none &none &none &tcm &tp &none &none // ╰─────────────┴─────────────┴─────────────╮ ╭─────────────┴─────────────┴─────────────╯ - &tsh &tsv &twin &tsess + &tsh &tsv &twin &tsess // ╰─────────────┴─────────────╯ ╰─────────────┴───────────── >; }; From a8b53f73fd90ad362cf9e1e63209be333923d490 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Fri, 9 Feb 2024 12:23:17 -0500 Subject: [PATCH 05/10] feat: add sesh keybind --- config/base_lower.keymap | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/config/base_lower.keymap b/config/base_lower.keymap index 02a6521..4650318 100644 --- a/config/base_lower.keymap +++ b/config/base_lower.keymap @@ -29,6 +29,21 @@ / { + ZMK_MACRO(sesh, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp LS(T)>;) + + ZMK_MACRO(tas, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp LC(J)>;) + + ZMK_MACRO(tproj, + wait-ms = <30>; + tap-ms = <40>; + bindings = <&kp LC(B) &kp LC(G)>;) + ZMK_MACRO(tpb, wait-ms = <30>; tap-ms = <40>; @@ -245,7 +260,7 @@ // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮ &none &none &none &none &tsnext &twprev &thumbs &twnext &none &none &none &none &none &tsprev &tpl &tpd &tpu &tpr - &none &none &none &none &tcm &tp &none &none + &none &none &none &none &tcm &tp &none &sesh // ╰─────────────┴─────────────┴─────────────╮ ╭─────────────┴─────────────┴─────────────╯ &tsh &tsv &twin &tsess // ╰─────────────┴─────────────╯ ╰─────────────┴───────────── From bfb87177763eb1a485946f524ecc5b849430090c Mon Sep 17 00:00:00 2001 From: gwg313 Date: Thu, 2 May 2024 00:54:34 -0400 Subject: [PATCH 06/10] add moon rp2040 --- build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.yaml b/build.yaml index 344db94..16dedd3 100644 --- a/build.yaml +++ b/build.yaml @@ -27,3 +27,5 @@ include: shield: flea_right - board: seeeduino_xiao_ble shield: moon + - board: seeeduino_xiao_rp2040 + shield: moon From 82ada9bf8abceebcc14f069b4d934ca1e655d32e Mon Sep 17 00:00:00 2001 From: gwg313 Date: Sat, 13 Jul 2024 17:57:14 -0400 Subject: [PATCH 07/10] fix: add prior idle timeout --- config/base_lower.keymap | 1 + 1 file changed, 1 insertion(+) diff --git a/config/base_lower.keymap b/config/base_lower.keymap index 4650318..cccdd93 100644 --- a/config/base_lower.keymap +++ b/config/base_lower.keymap @@ -153,6 +153,7 @@ bindings = ; \ key-positions = ; \ layers = ; \ + require-prior-idle-ms = <200>; \ }; /* KEY POSITIONS From da07c2b2cb6c8d3ea8fe3ab8eaf7c989ae2d4808 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Fri, 27 Sep 2024 23:14:14 -0400 Subject: [PATCH 08/10] Revert "fix: add prior idle timeout" This reverts commit 82ada9bf8abceebcc14f069b4d934ca1e655d32e. --- config/base_lower.keymap | 1 - 1 file changed, 1 deletion(-) diff --git a/config/base_lower.keymap b/config/base_lower.keymap index cccdd93..4650318 100644 --- a/config/base_lower.keymap +++ b/config/base_lower.keymap @@ -153,7 +153,6 @@ bindings = ; \ key-positions = ; \ layers = ; \ - require-prior-idle-ms = <200>; \ }; /* KEY POSITIONS From 03c030339ff72840fef810663a5430c871a081a9 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Sun, 29 Jun 2025 18:38:03 -0400 Subject: [PATCH 09/10] add woodecker job Signed-off-by: gwg313 --- .woodpecker.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..31ee1af --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,35 @@ +matrix: + include: + - BOARD: nice_nano_v2 + SHIELD: berylline_left + - BOARD: nice_nano_v2 + SHIELD: berylline_right + - BOARD: seeeduino_xiao + SHIELD: hummingbird + - BOARD: seeeduino_xiao_ble + SHIELD: hummingbird + - BOARD: nice_nano_v2 + SHIELD: flea_left + - BOARD: nice_nano_v2 + SHIELD: flea_right + - BOARD: seeeduino_xiao_ble + SHIELD: moon + - BOARD: seeeduino_xiao_rp2040 + SHIELD: moon + +steps: + - name: build_and_upload + image: registry.gwg313.xyz/library/zmk-prebuilt:latest + user: root + environment: + MINIO_KEY: + from_secret: MINIO_ACCESS_KEY + MINIO_SECRET: + from_secret: MINIO_SECRET_KEY + commands: + - id + - export Zephyr_DIR=/zmk/zephyr + - . /zmk/zmk/app + - west build -b ${BOARD} /zmk/zmk/app -- -DSHIELD=${SHIELD} -DZMK_CONFIG="$(pwd)/config" + - mc alias set minio https://s3.gwg313.xyz $MINIO_KEY $MINIO_SECRET + - mc cp -r build/zephyr/zmk.uf2 minio/zmk-builds/firmware/${CI_PIPELINE_NUMBER}/${BOARD}/${BOARD}_${SHIELD}.uf2 From dede0aac6f011815d54af2a15a3286e1d996d0e6 Mon Sep 17 00:00:00 2001 From: gwg313 Date: Mon, 30 Jun 2025 15:30:12 -0400 Subject: [PATCH 10/10] add badges to readme Signed-off-by: gwg313 --- .github/workflows/build.yml | 5 ----- .woodpecker.yml | 3 +-- README.md | 23 +++++++++++++---------- build.yaml | 31 ------------------------------- 4 files changed, 14 insertions(+), 48 deletions(-) delete mode 100644 .github/workflows/build.yml delete mode 100644 build.yaml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index d74fb89..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,5 +0,0 @@ -on: [push, pull_request, workflow_dispatch] - -jobs: - build: - uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main diff --git a/.woodpecker.yml b/.woodpecker.yml index 31ee1af..2b16e6a 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -27,9 +27,8 @@ steps: MINIO_SECRET: from_secret: MINIO_SECRET_KEY commands: - - id - export Zephyr_DIR=/zmk/zephyr - . /zmk/zmk/app - west build -b ${BOARD} /zmk/zmk/app -- -DSHIELD=${SHIELD} -DZMK_CONFIG="$(pwd)/config" - mc alias set minio https://s3.gwg313.xyz $MINIO_KEY $MINIO_SECRET - - mc cp -r build/zephyr/zmk.uf2 minio/zmk-builds/firmware/${CI_PIPELINE_NUMBER}/${BOARD}/${BOARD}_${SHIELD}.uf2 + - mc cp build/zephyr/zmk.uf2 minio/zmk-builds/firmware/build_${CI_PIPELINE_NUMBER}/${BOARD}_${SHIELD}.uf2 diff --git a/README.md b/README.md index 677e62a..131c45f 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,37 @@ # ZMK Personal Configurations -Welcome to my personal ZMK configurations! +## Build Status and Results + +[![Woodpecker CI](https://ci.gwg313.xyz/api/badges/gwg313/zmk-configs/status.svg)](https://ci.gwg313.xyz/gwg313/zmk-configs) +[![Firmware Builds](https://img.shields.io/badge/downloads-firmware-blue)](https://s3-console.gwg313.xyz/browser/zmk-builds) ## Introduction -These are my custom ZMK configurations for my keyboard setup. Feel free to explore and adapt them to suit your needs. +These are the configurations for my custom keyboard layouts. ## Getting Started -### Prerequisites - -This repository leverages GitHub Actions to automatically build the firmware files. You can find the artifacts in the Actions tab of this repository. All you need is your text editor of choice to make changes. - ## Configuring Your Keyboard ### Keymap -Adjust the relevant keymap configuration in `config/*.keymap` to define the function of each key on your keyboard. +Adjust the relevant keymap configuration in `config/*.keymap` to define the +function of each key on your keyboard. You can find my daily keymap [here](config/base_lower.keymap) ## Automated Build and Flash -The firmware is automatically built using GitHub Actions. Once built, it is uploaded as an artifact. No manual building is required. +The firmware is automatically built using GitHub Actions. Once built, it is +uploaded as an artifact. No manual building is required. -To flash them connect a compatable keyboard and enter bootloader mode, then drag and drop the relevant uf2 files. +To flash them connect a compatable keyboard and enter bootloader mode, then drag +and drop the relevant uf2 files. ## Support -For more information you can view the ZMK docs [here](https://zmk.dev/docs/development/documentation) +For more information you can view the ZMK docs +[here](https://zmk.dev/docs/development/documentation) If you have any questions or need assistance, feel free to reach out. diff --git a/build.yaml b/build.yaml deleted file mode 100644 index 16dedd3..0000000 --- a/build.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# This file generates the GitHub Actions matrix -# For simple board + shield combinations, add them -# to the top level board and shield arrays, for more -# control, add individual board + shield combinations to -# the `include` property, e.g: -# -# board: [ "nice_nano_v2" ] -# shield: [ "corne_left", "corne_right" ] -# include: -# - board: bdn9_rev2 -# - board: nice_nano_v2 -# shield: reviung41 -# ---- -include: - - board: nice_nano_v2 - shield: berylline_left - - board: nice_nano_v2 - shield: berylline_right - - board: seeeduino_xiao - shield: hummingbird - - board: seeeduino_xiao_ble - shield: hummingbird - - board: nice_nano_v2 - shield: flea_left - - board: nice_nano_v2 - shield: flea_right - - board: seeeduino_xiao_ble - shield: moon - - board: seeeduino_xiao_rp2040 - shield: moon