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 = [
{
assertion = config.nvim.enable;
message = "git module requires 'nvim' module (`nvimdiff`)";
}
];
warnings = lib.optional (
!config.nvim.enable
) "'git.enable' is enabled without 'nvim.enable' (not using 'nvimdiff')";
xdg.configFile."git/ignore".source = ./global.gitignore;
programs.git = {
enable = true;
settings = {
core.editor = "nvim";
settings = lib.mkMerge [
{
user = {
name = "Hektor Misplon";
username = "hektor";
@@ -146,24 +143,24 @@ in
date = "relative";
abbrevCommit = true;
};
merge = {
tool = "nvimdiff";
conflictStyle = "diff3";
};
diff = {
colorMoved = "zebra";
tool = "nvimdiff";
};
merge.conflictStyle = "diff3";
diff.colorMoved = "zebra";
commit.gpgSign = false;
interactive.singleKey = true;
pull.rebase = true;
rerere.enabled = true;
}
(lib.mkIf config.nvim.enable {
core.editor = "nvim";
diff.tool = "nvimdiff";
merge.tool = "nvimdiff";
difftool.prompt = false;
mergetool = {
prompt = false;
keepBackup = false;
};
commit.gpgSign = false;
interactive.singleKey = true;
pull.rebase = true;
rerere.enabled = true;
};
})
];
includes = [
{ path = personalEmail; }