diff options
| -rwxr-xr-x | .github/workflows/build_binaries.yaml | 20 | ||||
| -rw-r--r-- | README.md | 73 | ||||
| -rw-r--r-- | qmk.json | 8 |
3 files changed, 34 insertions, 67 deletions
diff --git a/.github/workflows/build_binaries.yaml b/.github/workflows/build_binaries.yaml deleted file mode 100755 index f7908fa..0000000 --- a/.github/workflows/build_binaries.yaml +++ /dev/null @@ -1,20 +0,0 @@ -name: Build QMK firmware - -on: [push, workflow_dispatch] - -permissions: - contents: write - -jobs: - build: - name: 'QMK Userspace Build' - uses: qmk/.github/.github/workflows/qmk_userspace_build.yml@main - with: - qmk_repo: qmk/qmk_firmware - qmk_ref: master - - publish: - name: 'QMK Userspace Publish' - uses: qmk/.github/.github/workflows/qmk_userspace_publish.yml@main - if: always() && !cancelled() - needs: build @@ -1,59 +1,42 @@ -# QMK Userspace +# Ruben's QMK Keymaps -This is a template repository which allows for an external set of QMK keymaps to be defined and compiled. This is useful for users who want to maintain their own keymaps without having to fork the main QMK repository. +This repository hosts my qmk keymaps. It includes keymaps for the keyboards I +use: -## Howto configure your build targets +- Anne Pro 2 (C18) +- Keychron Q3 with dial. -1. Run the normal `qmk setup` procedure if you haven't already done so -- see [QMK Docs](https://docs.qmk.fm/#/newbs) for details. -1. Fork this repository -1. Clone your fork to your local machine -1. Enable userspace in QMK config using `qmk config user.overlay_dir="$(realpath qmk_userspace)"` -1. Add a new keymap for your board using `qmk new-keymap` - * This will create a new keymap in the `keyboards` directory, in the same location that would normally be used in the main QMK repository. For example, if you wanted to add a keymap for the Planck, it will be created in `keyboards/planck/keymaps/<your keymap name>` - * You can also create a new keymap using `qmk new-keymap -kb <your_keyboard> -km <your_keymap>` - * Alternatively, add your keymap manually by placing it in the location specified above. - * `layouts/<layout name>/<your keymap name>/keymap.*` is also supported if you prefer the layout system -1. Add your keymap(s) to the build by running `qmk userspace-add -kb <your_keyboard> -km <your_keymap>` - * This will automatically update your `qmk.json` file - * Corresponding `qmk userspace-remove -kb <your_keyboard> -km <your_keymap>` will delete it - * Listing the build targets can be done with `qmk userspace-list` -1. Commit your changes +## Set up -## Howto build with GitHub +1. Run `qmk setup` procedure if you haven't already done so -- see the + [QMK Docs](https://docs.qmk.fm/#/newbs) for details. +2. Clone this repository +3. Enable userspace in QMK config using `qmk config user.overlay_dir="$(realpath qmk_userspace)"` -1. In the GitHub Actions tab, enable workflows -1. Push your changes above to your forked GitHub repository -1. Look at the GitHub Actions for a new actions run -1. Wait for the actions run to complete -1. Inspect the Releases tab on your repository for the latest firmware build +## Create New Keymap -## Howto build locally +Run `qmk new-keymap -kb <your_keyboard> -km <your_keymap>` to create the new +directory. -1. Run the normal `qmk setup` procedure if you haven't already done so -- see [QMK Docs](https://docs.qmk.fm/#/newbs) for details. -1. Fork this repository -1. Clone your fork to your local machine -1. `cd` into this repository's clone directory -1. Set global userspace path: `qmk config user.overlay_dir="$(realpath .)"` -- you MUST be located in the cloned userspace location for this to work correctly - * This will be automatically detected if you've `cd`ed into your userspace repository, but the above makes your userspace available regardless of your shell location. -1. Compile normally: `qmk compile -kb your_keyboard -km your_keymap` or `make your_keyboard:your_keymap` +* A new Q3 keymap: `qmk new-keymap -kb keychron/q3/ansi_encoder -km new_rbdr` +* A new Anne Pro 2 keymap: `qmk new-keymap -kb annepro2/c18 -km new_rbdr` -Alternatively, if you configured your build targets above, you can use `qmk userspace-compile` to build all of your userspace targets at once. +## Adding a keymap -## Extra info +Register your keymaps: -If you wish to point GitHub actions to a different repository, a different branch, or even a different keymap name, you can modify `.github/workflows/build_binaries.yml` to suit your needs. +* Q3 + rbdr: `qmk userspace-add -kb keychron/q3/ansi_encoder -km rbdr` +* AnnePro2 + rbdr: `qmk userspace-add -kb annepro2/c18 -km rbdr` -To override the `build` job, you can change the following parameters to use a different QMK repository or branch: -``` - with: - qmk_repo: qmk/qmk_firmware - qmk_ref: master -``` +## Build / Flash -If you wish to manually manage `qmk_firmware` using git within the userspace repository, you can add `qmk_firmware` as a submodule in the userspace directory instead. GitHub Actions will automatically use the submodule at the pinned revision if it exists, otherwise it will use the default latest revision of `qmk_firmware` from the main repository. +Assuming you ran setup as above, and you registered the keymaps, you can then +use `qmk compile` or `qmk flash`. -This can also be used to control which fork is used, though only upstream `qmk_firmware` will have support for external userspace until other manufacturers update their forks. +* Flash the Q3 with rbdr: `qmk flash -kb keychron/q3/ansi_encoder -km rbdr` +* Flash the Anne Pro 2 with rbdr: `qmk flash -kb annepro2/c18 -km rbdr` -1. (First time only) `git submodule add https://github.com/qmk/qmk_firmware.git` -1. (To update) `git submodule update --init --recursive` -1. Commit your changes to your userspace repository +You can also use `make keychron/q3/ansi_encoder:rbdr` or `make annepro2/c18:rbdr`. + +Alternatively, if you configured your build targets above, you can use +`qmk userspace-compile` to build all of your userspace targets at once. @@ -1,4 +1,8 @@ { - "userspace_version": "1.0", - "build_targets": [] + "userspace_version": "1.1", + "build_targets": [ + ["keychron/q3/ansi_encoder", "rbdr2"], + ["keychron/q3/ansi_encoder", "rbdr"], + ["annepro2/c18", "rbdr"] + ] }
\ No newline at end of file |