electria/nixowos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

defaults/git: add note, refine delta code

Browse source
This commit is contained in:
Elec3137 2026-03-24 11:13:21 -07:00
commit c83ec91ae2
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
defaults/git.nix
View file

@ -14,6 +14,7 @@ in
options = { options = {
nixowos.defaults.${name}.enable = lib.mkEnableOption name; nixowos.defaults.${name}.enable = lib.mkEnableOption name;
# NOTE: this doesn't really belong in defaults/
programs.${name}.delta.enable = lib.mkEnableOption "delta within git" // { programs.${name}.delta.enable = lib.mkEnableOption "delta within git" // {
default = true; default = true;
}; };
@ -35,9 +36,9 @@ in
merge.conflictStyle = "zdiff3"; merge.conflictStyle = "zdiff3";
commit.verbose = true; # show diffs in commit editor commit.verbose = true; # show diffs in commit editor
} }
(lib.mkIf superCfg.delta.enable { (lib.mkIf (superCfg.delta.enable && config.nixowos.allowAddingPackages) {
core.pager = "${pkgs.delta}/bin/delta"; core.pager = "${lib.getExe pkgs.delta}";
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only"; interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only";
delta.navigate = true; # use n and N to move between diff sections delta.navigate = true; # use n and N to move between diff sections
delta.diff-highlight = true; # simpler mode, highlights inter-line changes delta.diff-highlight = true; # simpler mode, highlights inter-line changes
}) })