From 3ccdd8d2e2000c8c6a37c34efe2d2f5d615ade0b Mon Sep 17 00:00:00 2001 From: imbytecat Date: Fri, 10 Apr 2026 22:27:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20nix=20flake=20check?= =?UTF-8?q?=20=E5=92=8C=20build=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 system.primaryUser (nix-darwin 新要求) - 全局应用 overlays 解决 comment-checker 找不到的问题 - git/ssh/delta 选项迁移到 home-manager 新 API - 包改名: dockerfile-language-server, nixfmt, nixd - neovim withRuby=false, catppuccin homeModules 更名 - 更新 flake.lock (nixpkgs, home-manager, catppuccin) --- flake.lock | 12 ++++++------ home/default.nix | 2 +- home/dev/git.nix | 32 ++++++++++++++++++-------------- home/dev/languages.nix | 6 +++--- home/dev/neovim.nix | 15 ++------------- home/shell/tools.nix | 1 + modules/darwin/default.nix | 3 +++ modules/shared/nix.nix | 5 ++++- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index a4b2148..493221d 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1775143651, - "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=", + "lastModified": 1775781825, + "narHash": "sha256-L5yKTpR+alrZU2XYYvIxCeCP4LBHU5jhwSj7H1VAavg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e", + "rev": "e35c39fca04fee829cecdf839a50eb9b54d8a701", "type": "github" }, "original": { @@ -99,11 +99,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 3656bcb..888876e 100644 --- a/home/default.nix +++ b/home/default.nix @@ -8,7 +8,7 @@ { imports = [ - inputs.catppuccin.homeManagerModules.catppuccin + inputs.catppuccin.homeModules.catppuccin ./shell ./dev ./theme.nix diff --git a/home/dev/git.nix b/home/dev/git.nix index 58de020..be0189c 100644 --- a/home/dev/git.nix +++ b/home/dev/git.nix @@ -3,19 +3,11 @@ { programs.git = { enable = true; - userName = "imbytecat"; - userEmail = "imbytecat@gmail.com"; - - delta = { - enable = true; - options = { - navigate = true; - side-by-side = true; - line-numbers = true; + settings = { + user = { + name = "imbytecat"; + email = "imbytecat@gmail.com"; }; - }; - - extraConfig = { merge.conflictstyle = "zdiff3"; pull.rebase = true; push.autoSetupRemote = true; @@ -26,6 +18,16 @@ }; }; + programs.delta = { + enable = true; + enableGitIntegration = true; + options = { + navigate = true; + side-by-side = true; + line-numbers = true; + }; + }; + programs.lazygit = { enable = true; settings = { @@ -46,7 +48,9 @@ programs.ssh = { enable = true; - addKeysToAgent = "yes"; - matchBlocks."*".identityFile = "~/.ssh/id_ed25519"; + matchBlocks."*" = { + identityFile = "~/.ssh/id_ed25519"; + addKeysToAgent = "yes"; + }; }; } diff --git a/home/dev/languages.nix b/home/dev/languages.nix index 947c008..584a052 100644 --- a/home/dev/languages.nix +++ b/home/dev/languages.nix @@ -19,16 +19,16 @@ typescript-language-server yaml-language-server vue-language-server - dockerfile-language-server-nodejs + dockerfile-language-server lua-language-server - nil # Nix LSP + nixd # Nix LSP # ── Linter / Formatter ── biome ruff shellcheck shfmt - nixfmt-rfc-style # nix formatter + nixfmt # nix formatter stylua # ── Code intelligence ── diff --git a/home/dev/neovim.nix b/home/dev/neovim.nix index 6ba3c9e..e67185e 100644 --- a/home/dev/neovim.nix +++ b/home/dev/neovim.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { programs.neovim = { @@ -8,17 +8,6 @@ vimAlias = true; withNodeJs = true; withPython3 = true; + withRuby = false; }; - - # ── Neovim distro configuration ── - # Option A: LazyVim / NvChad / AstroNvim via xdg.configFile - # xdg.configFile."nvim" = { - # source = ./nvim-config; - # recursive = true; - # }; - # - # Option B: NixVim (fully declarative) - # Add to flake.nix inputs: - # nixvim.url = "github:nix-community/nixvim"; - # Then configure here. } diff --git a/home/shell/tools.nix b/home/shell/tools.nix index b68c580..ad9e46c 100644 --- a/home/shell/tools.nix +++ b/home/shell/tools.nix @@ -75,6 +75,7 @@ programs.yazi = { enable = true; enableFishIntegration = true; + shellWrapperName = "y"; }; # ── Btop (system monitor) ─────────────────────────── diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 0a38e5c..a787ced 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -1,6 +1,9 @@ { pkgs, username, ... }: { + # ── Primary user (required by nix-darwin) ────────── + system.primaryUser = username; + # ── Shell ────────────────────────────────────────── programs.fish.enable = true; diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index 12fb9b2..4000e04 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -14,5 +14,8 @@ # ]; }; - nixpkgs.config.allowUnfree = true; + nixpkgs = { + config.allowUnfree = true; + overlays = [ (import ../../overlays) ]; + }; }