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

style(defaults/git): avoid using lib.mkMerge

Browse source 
This makes the code easier to understand,
and might fix a problem I noticed a while ago.
This commit is contained in:
electria 2026-04-26 08:25:26 -07:00
commit f3c3add058
Signed by: electria
SSH key fingerprint: SHA256:8LlB3ucPbBHqozqkhsNbaV5oG3SlzzqUj8FZDL6IPQs
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
defaults/git.nix
View file

@ -25,24 +25,22 @@ in
programs.git = { programs.git = {
enable = lib.mkIf config.nixowos.allowAddingPackages (lib.mkDefault true); enable = lib.mkIf config.nixowos.allowAddingPackages (lib.mkDefault true);
config = lib.mkMerge [ config = {
{ init.defaultBranch = "main";
init.defaultBranch = "main"; core.compression = 9; # max
core.compression = 9; # max credential.helper = "cache";
credential.helper = "cache";
push.autoSetupRemote = true; push.autoSetupRemote = true;
pull.ff = "only"; pull.ff = "only";
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 && config.nixowos.allowAddingPackages) { // (lib.optionalAttrs (superCfg.delta.enable && config.nixowos.allowAddingPackages) {
core.pager = "${lib.getExe pkgs.delta}"; core.pager = "${lib.getExe pkgs.delta}";
interactive.diffFilter = "${lib.getExe pkgs.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
}) });
];
}; };
}; };