mandlm
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat(git): use difftastic as diff viewer

main
mandlm 2022-07-07 09:25:17 +02:00
parent 29af43eb76
commit e7711fe634
Signed by: mandlm
GPG Key ID: 4AA25D647AA54CC7
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
home-manager/git.nix
View File

@ -22,6 +22,12 @@
rebase.autostash = true; rebase.autostash = true;
rerere.enabled = true; rerere.enabled = true;
worktree.guessRemote = true; worktree.guessRemote = true;
diff.external = "difft --background light";
diff.tool = "difftastic";
difftool.prompt = false;
difftool.difftastic.cmd = "difft --background light \"$LOCAL\" \"$REMOTE\"";
pager.difftool = true;
}; };
aliases = { aliases = {

1
home-mandlm.nix
View File

@ -26,6 +26,7 @@
tree tree
light light
element-desktop element-desktop
difftastic
]; ];
stateVersion = "22.05"; stateVersion = "22.05";