From aa67775e7555770a5c7ed51a77ab6307bb193fe0 Mon Sep 17 00:00:00 2001 From: moons Date: Mon, 6 Jul 2026 19:11:47 +0900 Subject: [PATCH] update --- flake.lock | 27 ++++++++++++----------- flake.nix | 4 ++-- modules/applications/git/home.nix | 2 +- modules/applications/vicinae.nix | 2 +- modules/applications/vim/home/default.nix | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index a960e8f..ab235a8 100644 --- a/flake.lock +++ b/flake.lock @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -463,15 +463,16 @@ ] }, "locked": { - "lastModified": 1783222121, - "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=", + "lastModified": 1783221248, + "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266", + "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -816,15 +817,16 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1783263374, - "narHash": "sha256-JM0KZ9qqavwQ0JMNfUUUk6FpXCLwWD5byad9j6hAWFU=", + "lastModified": 1782919967, + "narHash": "sha256-pRwjfB5HQJ3m8J8bOR43pPHtHI7VUJSqwLA3P06cOY0=", "owner": "nix-community", "repo": "nixvim", - "rev": "8a95c224e3a1b130ec5c18e612b80995e7b418ac", + "rev": "667c8471f4a0fb24d702d1a61af8609f1a5f1ba6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-26.05", "repo": "nixvim", "type": "github" } @@ -1045,16 +1047,15 @@ }, "systems_3": { "locked": { - "lastModified": 1774449309, - "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", "repo": "default", - "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "ref": "future-26.11", "repo": "default", "type": "github" } diff --git a/flake.nix b/flake.nix index d7ad772..b45cc3d 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -41,7 +41,7 @@ # Editor nixvim = { - url = "github:nix-community/nixvim"; + url = "github:nix-community/nixvim/nixos-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/applications/git/home.nix b/modules/applications/git/home.nix index 9ba7fc0..7e4d957 100644 --- a/modules/applications/git/home.nix +++ b/modules/applications/git/home.nix @@ -80,7 +80,7 @@ in signByDefault = true; }; - extraConfig = { + settings = { user.name = cfg.userName; user.email = cfg.userEmail; diff --git a/modules/applications/vicinae.nix b/modules/applications/vicinae.nix index 66739f6..2793958 100644 --- a/modules/applications/vicinae.nix +++ b/modules/applications/vicinae.nix @@ -17,7 +17,7 @@ in home-manager.sharedModules = [ inputs.vicinae.homeManagerModules.default { - services.vicinae = { + programs.vicinae = { enable = true; systemd = { enable = true; diff --git a/modules/applications/vim/home/default.nix b/modules/applications/vim/home/default.nix index 9eadde3..a1307a7 100644 --- a/modules/applications/vim/home/default.nix +++ b/modules/applications/vim/home/default.nix @@ -52,7 +52,7 @@ in stylua shfmt alejandra - nixfmt-rfc-style + nixfmt lua-language-server nixd ];