From 81865dc3eb91e67394fd64ab042d0b96da7e0ef7 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 16 Feb 2025 00:25:21 +0100 Subject: [PATCH 1/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'api-rs': 'github:uku3lig/api-rs/85f109bd9f7dc1811e980c256349d8fe96cda551?narHash=sha256-4j0sHUFlO6xzueyxcG2QiCChVqUqR1zP5L7u9gN3070%3D' (2025-02-10) → 'github:uku3lig/api-rs/2a2b0de722df8f067d30033c06cbd42fd86b6598?narHash=sha256-4OiClO0DIDegZux3FrFGIhiCLmjajWPMXORJiVnEeWo%3D' (2025-02-15) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 913c992..ae6e37f 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1739220494, - "narHash": "sha256-4j0sHUFlO6xzueyxcG2QiCChVqUqR1zP5L7u9gN3070=", + "lastModified": 1739661813, + "narHash": "sha256-4OiClO0DIDegZux3FrFGIhiCLmjajWPMXORJiVnEeWo=", "owner": "uku3lig", "repo": "api-rs", - "rev": "85f109bd9f7dc1811e980c256349d8fe96cda551", + "rev": "2a2b0de722df8f067d30033c06cbd42fd86b6598", "type": "github" }, "original": { From 5e484427c86a09737cef52a8df03c2340d1f7354 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 16 Feb 2025 19:04:19 +0100 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/112e6591b2d6313b1bd05a80a754a8ee42432a7e?narHash=sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE%2BVl1oMCNu3RpPE0%3D' (2025-02-08) → 'github:ipetkov/crane/bef2b45cd1273a9e621fb5292de89f4ed59ad812?narHash=sha256-pPiI27T416xAAUETorkLAgHQMiLT92moOrf0ItHhtPA%3D' (2025-02-15) • Updated input 'home-manager': 'github:nix-community/home-manager/5031c6d2978109336637977c165f82aa49fa16a7?narHash=sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4%3D' (2025-02-13) → 'github:nix-community/home-manager/ec130e700959ee10b63eedbc87758d20264a9588?narHash=sha256-dvByZPuVmBgOBLq8GohBy9hEd0/JXj5goXK2OY1Pvgk%3D' (2025-02-16) • Updated input 'mystia': 'github:soopyc/mystia/90efcef5c64b81740272a696f595c606bb47b8ab?narHash=sha256-8z5cubs0Q3JWV0pEJN/s6ZtGCdwny2qq9u990lA2QIg%3D' (2025-02-14) → 'github:soopyc/mystia/7bc243c0a432940d8feee46ed697186fafb0f49b?narHash=sha256-pZTAlSjsCo5rOD4JmxTA/BUAtPvcSZ35UIx%2BEs%2B92Ck%3D' (2025-02-14) • Updated input 'nixos-wsl': 'github:nix-community/NixOS-WSL/63c3b4ed1712a3a0621002cd59bfdc80875ecbb0?narHash=sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM%3D' (2025-01-05) → 'github:nix-community/NixOS-WSL/c084e05fff6b2601de351e1bbee00485bf003f35?narHash=sha256-J3tgc57E41sEVHQtQeCPNAh62NDnZrJCkSlaAj2gYs8%3D' (2025-02-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/2ff53fe64443980e139eaa286017f53f88336dd0?narHash=sha256-%2B/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc%3D' (2025-02-13) → 'github:NixOS/nixpkgs/8bb37161a0488b89830168b81c48aed11569cb93?narHash=sha256-%2B/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN%2B24g4%3D' (2025-02-15) • Updated input 'vscode-extensions': 'github:nix-community/nix-vscode-extensions/6113f471097e12ff293e86b36e74aee21c55204e?narHash=sha256-Bfok%2BAZ/iTOmJNndwR7wOZbsuL5/gks3GH2qvWTxpGs%3D' (2025-02-14) → 'github:nix-community/nix-vscode-extensions/370af219cf4ad7660e3ad4577849fb0478edb33c?narHash=sha256-Tdzu06QlI8DsYdXNe96c9eu0clj9Wkd1cKo6em/0xPU%3D' (2025-02-16) --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index ae6e37f..3c842d8 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "crane": { "locked": { - "lastModified": 1739053031, - "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", + "lastModified": 1739638817, + "narHash": "sha256-pPiI27T416xAAUETorkLAgHQMiLT92moOrf0ItHhtPA=", "owner": "ipetkov", "repo": "crane", - "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", + "rev": "bef2b45cd1273a9e621fb5292de89f4ed59ad812", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1739470101, - "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", + "lastModified": 1739724290, + "narHash": "sha256-dvByZPuVmBgOBLq8GohBy9hEd0/JXj5goXK2OY1Pvgk=", "owner": "nix-community", "repo": "home-manager", - "rev": "5031c6d2978109336637977c165f82aa49fa16a7", + "rev": "ec130e700959ee10b63eedbc87758d20264a9588", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1739520123, - "narHash": "sha256-8z5cubs0Q3JWV0pEJN/s6ZtGCdwny2qq9u990lA2QIg=", + "lastModified": 1739556410, + "narHash": "sha256-pZTAlSjsCo5rOD4JmxTA/BUAtPvcSZ35UIx+Es+92Ck=", "owner": "soopyc", "repo": "mystia", - "rev": "90efcef5c64b81740272a696f595c606bb47b8ab", + "rev": "7bc243c0a432940d8feee46ed697186fafb0f49b", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1736095716, - "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", + "lastModified": 1739718817, + "narHash": "sha256-J3tgc57E41sEVHQtQeCPNAh62NDnZrJCkSlaAj2gYs8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", + "rev": "c084e05fff6b2601de351e1bbee00485bf003f35", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739446958, - "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", + "lastModified": 1739580444, + "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", + "rev": "8bb37161a0488b89830168b81c48aed11569cb93", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1739497746, - "narHash": "sha256-Bfok+AZ/iTOmJNndwR7wOZbsuL5/gks3GH2qvWTxpGs=", + "lastModified": 1739670916, + "narHash": "sha256-Tdzu06QlI8DsYdXNe96c9eu0clj9Wkd1cKo6em/0xPU=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "6113f471097e12ff293e86b36e74aee21c55204e", + "rev": "370af219cf4ad7660e3ad4577849fb0478edb33c", "type": "github" }, "original": { From d7cce1e72e884d58d5a5cec1dad6fe45c8a8d77d Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 16 Feb 2025 19:10:50 +0100 Subject: [PATCH 3/4] fix(fuji-wsl): remove nativeSystemd removed by upstream --- systems/fuji-wsl/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/fuji-wsl/default.nix b/systems/fuji-wsl/default.nix index 7343981..12ec563 100644 --- a/systems/fuji-wsl/default.nix +++ b/systems/fuji-wsl/default.nix @@ -15,7 +15,6 @@ wsl = { enable = true; defaultUser = "leo"; - nativeSystemd = true; useWindowsDriver = true; wslConf.network = { hostname = config.networking.hostName; From 7f144cf50a8ce001dc44be66735d48fb78b2f857 Mon Sep 17 00:00:00 2001 From: uku Date: Sun, 16 Feb 2025 19:12:15 +0100 Subject: [PATCH 4/4] fix(programs/git): use new format option for signing --- programs/git.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/git.nix b/programs/git.nix index 1e0effa..0ba006b 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -9,6 +9,7 @@ userEmail = "hi@uku.moe"; signing = { + format = "ssh"; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+7+KfdOrhcnHayxvOENUeMx8rE4XEIV/AxMHiaNUP8"; signByDefault = true; }; @@ -19,7 +20,6 @@ init.defaultBranch = "main"; core.autocrlf = "input"; push.autoSetupRemote = true; - gpg.format = "ssh"; merge.conflictStyle = "zdiff3"; rebase.autoStash = true; status.submoduleSummary = true;