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)
This commit is contained in:
2026-04-10 22:27:23 +08:00
parent 7dc7cc10c3
commit 3ccdd8d2e2
8 changed files with 38 additions and 38 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
{
imports = [
inputs.catppuccin.homeManagerModules.catppuccin
inputs.catppuccin.homeModules.catppuccin
./shell
./dev
./theme.nix
+18 -14
View File
@@ -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";
};
};
}
+3 -3
View File
@@ -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 ──
+2 -13
View File
@@ -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.
}
+1
View File
@@ -75,6 +75,7 @@
programs.yazi = {
enable = true;
enableFishIntegration = true;
shellWrapperName = "y";
};
# ── Btop (system monitor) ───────────────────────────