ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

home: git: use diff-highlight in interactive diffs

Browse source 
Now even `git log -p` and `git add -p` can use the more readable diffs.
This commit is contained in:
Bruno BELANYI 2021-11-29 13:13:43 +01:00
parent d86ff6192c
commit 48a9f9b11e
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
home/git/default.nix
View file

@ -3,6 +3,7 @@ let
cfg = config.my.home.git; cfg = config.my.home.git;
inherit (lib.my) mkMailAddress; inherit (lib.my) mkMailAddress;
diff-highlight = "${pkgs.gitAndTools.gitFull}/share/git/contrib/diff-highlight/diff-highlight";
in in
{ {
options.my.home.git = with lib.my; { options.my.home.git = with lib.my; {
@ -99,15 +100,15 @@ in
defaultBranch = "main"; defaultBranch = "main";
}; };
pager = interactive = {
let diffFilter = "${diff-highlight}";
diff-highlight = "${pkgs.gitAndTools.gitFull}/share/git/contrib/diff-highlight/diff-highlight"; };
in
{ pager = {
diff = "${diff-highlight} | less"; diff = "${diff-highlight} | less";
log = "${diff-highlight} | less"; log = "${diff-highlight} | less";
show = "${diff-highlight} | less"; show = "${diff-highlight} | less";
}; };
pull = { pull = {
# Avoid useless merge commits # Avoid useless merge commits