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:
+18
-14
@@ -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";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user