diff --git a/flake.lock b/flake.lock index 3c842d8..913c992 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1739661813, - "narHash": "sha256-4OiClO0DIDegZux3FrFGIhiCLmjajWPMXORJiVnEeWo=", + "lastModified": 1739220494, + "narHash": "sha256-4j0sHUFlO6xzueyxcG2QiCChVqUqR1zP5L7u9gN3070=", "owner": "uku3lig", "repo": "api-rs", - "rev": "2a2b0de722df8f067d30033c06cbd42fd86b6598", + "rev": "85f109bd9f7dc1811e980c256349d8fe96cda551", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "crane": { "locked": { - "lastModified": 1739638817, - "narHash": "sha256-pPiI27T416xAAUETorkLAgHQMiLT92moOrf0ItHhtPA=", + "lastModified": 1739053031, + "narHash": "sha256-LrMDRuwAlRFD2T4MgBSRd1s2VtOE+Vl1oMCNu3RpPE0=", "owner": "ipetkov", "repo": "crane", - "rev": "bef2b45cd1273a9e621fb5292de89f4ed59ad812", + "rev": "112e6591b2d6313b1bd05a80a754a8ee42432a7e", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1739724290, - "narHash": "sha256-dvByZPuVmBgOBLq8GohBy9hEd0/JXj5goXK2OY1Pvgk=", + "lastModified": 1739470101, + "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ec130e700959ee10b63eedbc87758d20264a9588", + "rev": "5031c6d2978109336637977c165f82aa49fa16a7", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1739556410, - "narHash": "sha256-pZTAlSjsCo5rOD4JmxTA/BUAtPvcSZ35UIx+Es+92Ck=", + "lastModified": 1739520123, + "narHash": "sha256-8z5cubs0Q3JWV0pEJN/s6ZtGCdwny2qq9u990lA2QIg=", "owner": "soopyc", "repo": "mystia", - "rev": "7bc243c0a432940d8feee46ed697186fafb0f49b", + "rev": "90efcef5c64b81740272a696f595c606bb47b8ab", "type": "github" }, "original": { @@ -204,11 +204,11 @@ ] }, "locked": { - "lastModified": 1739718817, - "narHash": "sha256-J3tgc57E41sEVHQtQeCPNAh62NDnZrJCkSlaAj2gYs8=", + "lastModified": 1736095716, + "narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "c084e05fff6b2601de351e1bbee00485bf003f35", + "rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", + "lastModified": 1739446958, + "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", + "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1739670916, - "narHash": "sha256-Tdzu06QlI8DsYdXNe96c9eu0clj9Wkd1cKo6em/0xPU=", + "lastModified": 1739497746, + "narHash": "sha256-Bfok+AZ/iTOmJNndwR7wOZbsuL5/gks3GH2qvWTxpGs=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "370af219cf4ad7660e3ad4577849fb0478edb33c", + "rev": "6113f471097e12ff293e86b36e74aee21c55204e", "type": "github" }, "original": { diff --git a/programs/git.nix b/programs/git.nix index 0ba006b..1e0effa 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -9,7 +9,6 @@ userEmail = "hi@uku.moe"; signing = { - format = "ssh"; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+7+KfdOrhcnHayxvOENUeMx8rE4XEIV/AxMHiaNUP8"; signByDefault = true; }; @@ -20,6 +19,7 @@ init.defaultBranch = "main"; core.autocrlf = "input"; push.autoSetupRemote = true; + gpg.format = "ssh"; merge.conflictStyle = "zdiff3"; rebase.autoStash = true; status.submoduleSummary = true; diff --git a/systems/fuji-wsl/default.nix b/systems/fuji-wsl/default.nix index 12ec563..7343981 100644 --- a/systems/fuji-wsl/default.nix +++ b/systems/fuji-wsl/default.nix @@ -15,6 +15,7 @@ wsl = { enable = true; defaultUser = "leo"; + nativeSystemd = true; useWindowsDriver = true; wslConf.network = { hostname = config.networking.hostName;