kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-21 04:11:07 +01:00
Code Releases Activity

feat(git): bye diff-so-fancy, hello delta

Browse Source
This commit is contained in:
Kierán Meinhardt
2022-01-18 21:52:46 +01:00
parent 7518c0f893
commit efb8dff677
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
configs/git.nix
View File

@@ -78,25 +78,13 @@ in
pull.ff = "only"; pull.ff = "only";
rebase.autoStash = true; rebase.autoStash = true;
merge.autoStash = true; merge.autoStash = true;
core.pager =
"${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | ${pkgs.less}/bin/less --tabs=4 -RFX"; # ref https://github.com/dandavison/delta
color = { core.pager = "${pkgs.delta}/bin/delta";
ui = true; interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
diff = { delta.navigate = true;
meta = "11"; merge.conflictStyle = "diff3";
frag = "magenta bold"; diff.colorMoved = "default";
commit = "yellow bold";
old = "red bold";
new = "green bold";
whitespace = "red reverse";
};
diff-highlight = {
oldNormal = "red bold";
oldHighlight = "red bold 52";
newNormal = "green bold";
newHighlight = "green bold 22";
};
};
}; };
}; };
}; };