1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00

git: add option for difftastic context

The ability to control the number of contextual lines is a basic
expectation of a diff program, so a dedicated option feels warranted.
This commit is contained in:
Brian Lyles 2025-09-30 00:04:31 -05:00 committed by Austin Horstman
parent d328666dba
commit 1652349e57
3 changed files with 13 additions and 2 deletions

View file

@ -356,6 +356,15 @@ in
''; '';
}; };
context = mkOption {
type = types.ints.u32;
default = 3;
example = 5;
description = ''
Determines the number of contextual lines to show around changed lines.
'';
};
display = mkOption { display = mkOption {
type = types.enum [ type = types.enum [
"side-by-side" "side-by-side"
@ -833,6 +842,7 @@ in
"--color ${cfg.difftastic.color}" "--color ${cfg.difftastic.color}"
"--background ${cfg.difftastic.background}" "--background ${cfg.difftastic.background}"
"--display ${cfg.difftastic.display}" "--display ${cfg.difftastic.display}"
"--context ${toString cfg.difftastic.context}"
]; ];
in in
(lib.mkMerge [ (lib.mkMerge [

View file

@ -1,9 +1,9 @@
[diff] [diff]
external = "@difftastic@/bin/difft --color always --background dark --display inline" external = "@difftastic@/bin/difft --color always --background dark --display inline --context 5"
tool = "difftastic" tool = "difftastic"
[difftool "difftastic"] [difftool "difftastic"]
cmd = "@difftastic@/bin/difft --color always --background dark --display inline $LOCAL $REMOTE" cmd = "@difftastic@/bin/difft --color always --background dark --display inline --context 5 $LOCAL $REMOTE"
[gpg] [gpg]
format = "openpgp" format = "openpgp"

View file

@ -7,6 +7,7 @@
enableAsDifftool = true; enableAsDifftool = true;
background = "dark"; background = "dark";
color = "always"; color = "always";
context = 5;
display = "inline"; display = "inline";
}; };
}; };