From 57b1260a698f43cc5e685ad46a1fcacab4dfc1e5 Mon Sep 17 00:00:00 2001 From: Julia Mertz Date: Fri, 11 Oct 2024 19:50:23 +0200 Subject: [PATCH] small fixes --- flake.lock | 18 +++++++++--------- flake.nix | 2 +- glove80.conf | 1 + glove80.keymap | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 29c619b..cc1ac9e 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727718894, - "narHash": "sha256-2RDtgGJz3UVe3WP5m0/4kbG2fMjMFxfPJXXkcO7kntE=", + "lastModified": 1728585085, + "narHash": "sha256-O34W5ZzyWw5d/m5Nt0NPkFAJMRClt80661LrLwxqYZo=", "owner": "juliamertz", "repo": "glove80-firmware-updater", - "rev": "6418721d1b08586853267d48d5e4e40352e03f04", + "rev": "e0d91d7b19c717a307a42085d819cca7384d7ac5", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -137,11 +137,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 697c9c5..80152bb 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ packages.firmware = callPackage ./packages/firmware.nix { inherit inputs; }; packages.visual = callPackage ./packages/visual.nix { inherit inputs; }; packages.flash = writeShellScriptBin "flash" '' - ${lib.getExe firmwareLoader} --file ${packages.firmware}/glove80.uf2 + ${lib.getExe firmwareLoader} --file ${packages.firmware}/glove80.uf2 --mount ''; packages.default = packages.firmware; diff --git a/glove80.conf b/glove80.conf index b77b776..8f4fe18 100644 --- a/glove80.conf +++ b/glove80.conf @@ -1,3 +1,4 @@ CONFIG_EXPERIMENTAL_RGB_LAYER=y CONFIG_ZMK_RGB_UNDERGLOW_AUTO_OFF_IDLE=y CONFIG_ZMK_IDLE_TIMEOUT=300000 +CONFIG_BT_DEVICE_NAME="Julia's Glove80" diff --git a/glove80.keymap b/glove80.keymap index 665c34d..ee43d33 100644 --- a/glove80.keymap +++ b/glove80.keymap @@ -294,7 +294,7 @@ &kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSLH &kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT - &kp GRAVE &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LCTRL &lower &kp RALT &kp RCTRL &kp RSHFT &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp PG_UP + &kp GRAVE &kp Z &kp X &kp C &kp V &kp B &kp LSHFT &kp LCTRL &lower &kp LALT &kp RCTRL &kp RSHFT &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp PG_UP &magic LAYER_Magic 0 &tog 3 &kp END &kp LEFT &kp RIGHT &kp SPACE &kp LGUI &kp RET &kp RGUI &kp RET &kp BSPC &kp UP &kp DOWN &kp LBKT &kp RBKT &kp PG_DN >; };