From 08f9538d3c76f7d0f34a4e7e8c4571951e6e09b7 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 21 Feb 2025 15:08:34 -0600 Subject: [PATCH 1/2] Update flake locks and add USB/BLE toggle --- config/lily58.keymap | 11 ++++++----- flake.lock | 12 ++++++------ flake.nix | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/config/lily58.keymap b/config/lily58.keymap index a9544cc..07f5a58 100644 --- a/config/lily58.keymap +++ b/config/lily58.keymap @@ -8,6 +8,7 @@ #include #include #include +#include &mt { flavor = "tap-preferred"; @@ -120,11 +121,11 @@ bt_layer { bindings = < -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &bt BT_CLR -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &trans &tog 0 +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &bt BT_CLR +&trans &trans &trans &trans &trans &trans &out OUT_USB &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &out OUT_TOG &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 +&trans &trans &trans &trans &trans &trans &trans &trans &out OUT_BLE &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &tog 0 >; }; }; diff --git a/flake.lock b/flake.lock index 2f378df..60491dc 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1729980323, - "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", + "lastModified": 1740019556, + "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", + "rev": "dad564433178067be1fbdfcce23b546254b6d641", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1729989359, - "narHash": "sha256-sKv7amJel5SZVo/qMO9CytJTT2ehtwU/SqI+x+09mWc=", + "lastModified": 1739666186, + "narHash": "sha256-Q052i4ojEXzKHDUf95EJvIbC2+VO+dqMwITS2/toZsY=", "owner": "lilyinstarlight", "repo": "zmk-nix", - "rev": "1ceefd4eff92f9f6f56bb467beef35d38d9e9a12", + "rev": "d9c7de21f56c4bc69bd10569148a14306cd0e5d6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f2b1e3a..48ab024 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ board = "nice_nano_v2"; shield = "lily58_%PART%"; - zephyrDepsHash = "sha256-sYbE6czbVLc6dnOWhVfn2iN/Gjo+wAz4Wh8zfgRw2nM="; + zephyrDepsHash = "sha256-HK0VynvHq7Na2EBliSYuyN1T4l0KtfsJHhGMQpAiLCE="; meta = { description = "ZMK firmware"; From ccd55a102fe3bcbde69aa7ac3a16d48e2bcda40c Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 22 Feb 2025 03:46:59 -0600 Subject: [PATCH 2/2] Finally a good, pinned build This has been struggling to build for quite some time. For many rounds the git checkouts were not succeeding. Then, the git repositories were not matching what used to be. It would be a really good idea to figure out all the dependencies that are needing to be packaged, but I'm not sure I have the gumption to do that at this point --- .github/workflows/build.yml | 1 - flake.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66fa789..d74fb89 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,5 +2,4 @@ on: [push, pull_request, workflow_dispatch] jobs: build: - #uses: petejohanson/zmk/.github/workflows/build-user-config.yml@feat/pointers-move-scroll uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main diff --git a/flake.nix b/flake.nix index 48ab024..b5a9415 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ board = "nice_nano_v2"; shield = "lily58_%PART%"; - zephyrDepsHash = "sha256-HK0VynvHq7Na2EBliSYuyN1T4l0KtfsJHhGMQpAiLCE="; + zephyrDepsHash = "sha256-eD+2lu2w3mLaegEn7sxWmkCKk2m7Vor+4BlEao5LPR8="; meta = { description = "ZMK firmware";