fix: 修复 nix flake check 和 build 错误

- 添加 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

@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775143651,
+        "lastModified": 1775781825,
-        "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=",
+        "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,
+        "lastModified": 1775710090,
-        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -8,7 +8,7 @@
 
 {
   imports = [
-    inputs.catppuccin.homeManagerModules.catppuccin
+    inputs.catppuccin.homeModules.catppuccin
     ./shell
     ./dev
     ./theme.nix

home/dev/git.nix

@@ -3,19 +3,11 @@
 {
   programs.git = {
     enable = true;
-    userName = "imbytecat";
+    settings = {
-    userEmail = "imbytecat@gmail.com";
+      user = {
-
+        name = "imbytecat";
-    delta = {
+        email = "imbytecat@gmail.com";
-      enable = true;
-      options = {
-        navigate = true;
-        side-by-side = true;
-        line-numbers = true;
       };
-    };
-
-    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."*" = {
-    matchBlocks."*".identityFile = "~/.ssh/id_ed25519";
+      identityFile = "~/.ssh/id_ed25519";
+      addKeysToAgent = "yes";
+    };
   };
 }

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 ──

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.
 }

home/shell/tools.nix

@@ -75,6 +75,7 @@
   programs.yazi = {
     enable = true;
     enableFishIntegration = true;
+    shellWrapperName = "y";
   };
 
   # ── Btop (system monitor) ───────────────────────────

modules/darwin/default.nix

@@ -1,6 +1,9 @@
 { pkgs, username, ... }:
 
 {
+  # ── Primary user (required by nix-darwin) ──────────
+  system.primaryUser = username;
+
   # ── Shell ──────────────────────────────────────────
   programs.fish.enable = true;
 

modules/shared/nix.nix

@@ -14,5 +14,8 @@
     # ];
   };
 
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs = {
+    config.allowUnfree = true;
+    overlays = [ (import ../../overlays) ];
+  };
 }