forked from poz/niksos
switch from includes to extraConfig in git module
Xddddddddddd
This commit is contained in:
parent
76cbdaaf2f
commit
e2d5090e29
1 changed files with 16 additions and 18 deletions
|
@ -41,25 +41,23 @@ in {
|
|||
key = cfg.signingKey;
|
||||
signByDefault = true;
|
||||
};
|
||||
includes = [
|
||||
{
|
||||
contents = {
|
||||
core = {
|
||||
editor = cfg.editor;
|
||||
pager = "${pkgs.delta}/bin/delta";
|
||||
};
|
||||
init.defaultBranch = cfg.defaultBranch;
|
||||
push.autoSetupRemote = true;
|
||||
commit.verbose = true;
|
||||
merge.conflictstyle = "zdiff3";
|
||||
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
|
||||
diff.algorithm = "histogram";
|
||||
transfer.fsckobjects = true;
|
||||
fetch.fsckobjects = true;
|
||||
receive.fsckobjects = true;
|
||||
extraConfig = {
|
||||
contents = {
|
||||
core = {
|
||||
editor = cfg.editor;
|
||||
pager = "${pkgs.delta}/bin/delta";
|
||||
};
|
||||
}
|
||||
];
|
||||
init.defaultBranch = cfg.defaultBranch;
|
||||
push.autoSetupRemote = true;
|
||||
commit.verbose = true;
|
||||
merge.conflictstyle = "zdiff3";
|
||||
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
|
||||
diff.algorithm = "histogram";
|
||||
transfer.fsckobjects = true;
|
||||
fetch.fsckobjects = true;
|
||||
receive.fsckobjects = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue