greg/zmk-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lily58-update' into lily58

Browse Source
This commit is contained in:
Greg Hellings
2025-03-06 22:39:26 -06:00
parent c94b963e51 ccd55a102f
commit bf9689889d
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build.yml
-1
View File
@@ -2,5 +2,4 @@ on: [push, pull_request, workflow_dispatch]
jobs: jobs:
build: build:
#uses: petejohanson/zmk/.github/workflows/build-user-config.yml@feat/pointers-move-scroll
uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
config/lily58.keymap
+7 -6
View File
@@ -8,7 +8,8 @@
#include <behaviors.dtsi> #include <behaviors.dtsi>
#include <dt-bindings/zmk/bt.h> #include <dt-bindings/zmk/bt.h>
#include <dt-bindings/zmk/keys.h> #include <dt-bindings/zmk/keys.h>
#include <dt-bindings/zmk/pointing.h> #include <dt-bindings/zmk/mouse.h>
#include <dt-bindings/zmk/outputs.h>
&mt { &mt {
flavor = "tap-preferred"; flavor = "tap-preferred";
@@ -121,11 +122,11 @@
bt_layer { bt_layer {
bindings = < 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 &bt BT_CLR
&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &out OUT_USB &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 &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 &trans &trans &trans &trans &trans &trans &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 &trans &trans &trans &trans &trans &trans &trans &tog 0
>; >;
}; };
flake.lock
Generated
+6 -6
View File
@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729980323, "lastModified": 1740019556,
"narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=", "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "86e78d3d2084ff87688da662cf78c2af085d8e73", "rev": "dad564433178067be1fbdfcce23b546254b6d641",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729989359, "lastModified": 1739666186,
"narHash": "sha256-sKv7amJel5SZVo/qMO9CytJTT2ehtwU/SqI+x+09mWc=", "narHash": "sha256-Q052i4ojEXzKHDUf95EJvIbC2+VO+dqMwITS2/toZsY=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "zmk-nix", "repo": "zmk-nix",
"rev": "1ceefd4eff92f9f6f56bb467beef35d38d9e9a12", "rev": "d9c7de21f56c4bc69bd10569148a14306cd0e5d6",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+1 -1
View File
@@ -22,7 +22,7 @@
board = "nice_nano_v2"; board = "nice_nano_v2";
shield = "lily58_%PART%"; shield = "lily58_%PART%";
zephyrDepsHash = "sha256-sYbE6czbVLc6dnOWhVfn2iN/Gjo+wAz4Wh8zfgRw2nM="; zephyrDepsHash = "sha256-eD+2lu2w3mLaegEn7sxWmkCKk2m7Vor+4BlEao5LPR8=";
meta = { meta = {
description = "ZMK firmware"; description = "ZMK firmware";