5 changed files with 50 additions and 113 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,5 @@
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+    uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -1,34 +0,0 @@
-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:
-      - 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 build/zephyr/zmk.uf2 minio/zmk-builds/firmware/build_${CI_PIPELINE_NUMBER}/${BOARD}_${SHIELD}.uf2
--- a/README.md
+++ b/README.md
@ -1,37 +1,34 @@
 # ZMK Personal 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)
+Welcome to my personal ZMK configurations!

 ## Introduction

-These are the configurations for my custom keyboard layouts.
+These are my custom ZMK configurations for my keyboard setup. Feel free to explore and adapt them to suit your needs.

 ## 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.

--- a/build.yaml
+++ b/build.yaml
@ -0,0 +1,29 @@
+# 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
--- a/config/base_lower.keymap
+++ b/config/base_lower.keymap
@ -29,75 +29,15 @@
 / {


-    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>;
-        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>;
-        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>;
-        bindings = <&kp LC(B) &kp H>;)
+        bindings = <&kp LC(B) &kp RARW>;)

    ZMK_MACRO(tpl,
        wait-ms = <30>;
        tap-ms = <40>;
-        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>;)
+        bindings = <&kp LC(B) &kp LARW>;)

    ZMK_MACRO(tsh,
        wait-ms = <30>;
@ -258,11 +198,11 @@
            label = "Tmux";
            bindings = <
        // ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮   ╭─────────────┬─────────────┬─────────────┬─────────────┬─────────────╮
-                           &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         &sesh
+                           &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
        // ╰─────────────┴─────────────┴─────────────╮                                                           ╭─────────────┴─────────────┴─────────────╯
-                                                          &tsh          &tsv              &twin         &tsess
+                                                       &tsh          &tsv              &twin         &tsess
        //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────
            >;
        };