git: enable git difftool
to use difftastic
This commit is contained in:
parent
e11f903aec
commit
10e9daa085
10
modules/universal/env/home-manager.nix
vendored
10
modules/universal/env/home-manager.nix
vendored
|
@ -377,8 +377,14 @@ in
|
||||||
userEmail = "colin@uninsane.org";
|
userEmail = "colin@uninsane.org";
|
||||||
|
|
||||||
aliases = { co = "checkout"; };
|
aliases = { co = "checkout"; };
|
||||||
# TODO: figure out how to get the old `diff` for generating patches
|
extraConfig = {
|
||||||
# difftastic.enable = true; # better diff rendering
|
# difftastic docs:
|
||||||
|
# - <https://difftastic.wilfred.me.uk/git.html>
|
||||||
|
diff.tool = "difftastic";
|
||||||
|
difftool.prompt = false;
|
||||||
|
"difftool \"difftastic\"".cmd = ''${pkgs.difftastic}/bin/difft "$LOCAL" "$REMOTE"'';
|
||||||
|
# now run `git difftool` to use difftastic git
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
neovim = {
|
neovim = {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user