fix(git): degrade gracefully without 'nvim'

This commit is contained in:
2026-10-11 17:34:29 +02:00
parent fbd34508c5
commit 14c6a27b21
+18 -21
View File
@@ -70,19 +70,16 @@ in
}; };
} }
// { // {
assertions = [ warnings = lib.optional (
{ !config.nvim.enable
assertion = config.nvim.enable; ) "'git.enable' is enabled without 'nvim.enable' (not using 'nvimdiff')";
message = "git module requires 'nvim' module (`nvimdiff`)";
}
];
xdg.configFile."git/ignore".source = ./global.gitignore; xdg.configFile."git/ignore".source = ./global.gitignore;
programs.git = { programs.git = {
enable = true; enable = true;
settings = { settings = lib.mkMerge [
core.editor = "nvim"; {
user = { user = {
name = "Hektor Misplon"; name = "Hektor Misplon";
username = "hektor"; username = "hektor";
@@ -146,24 +143,24 @@ in
date = "relative"; date = "relative";
abbrevCommit = true; abbrevCommit = true;
}; };
merge = { merge.conflictStyle = "diff3";
tool = "nvimdiff"; diff.colorMoved = "zebra";
conflictStyle = "diff3"; commit.gpgSign = false;
}; interactive.singleKey = true;
diff = { pull.rebase = true;
colorMoved = "zebra"; rerere.enabled = true;
tool = "nvimdiff"; }
}; (lib.mkIf config.nvim.enable {
core.editor = "nvim";
diff.tool = "nvimdiff";
merge.tool = "nvimdiff";
difftool.prompt = false; difftool.prompt = false;
mergetool = { mergetool = {
prompt = false; prompt = false;
keepBackup = false; keepBackup = false;
}; };
commit.gpgSign = false; })
interactive.singleKey = true; ];
pull.rebase = true;
rerere.enabled = true;
};
includes = [ includes = [
{ path = personalEmail; } { path = personalEmail; }