forked from poz/niksos
oh my god this is so fucking stupid
I moved from `includes` to `extraConfig` and didn't remove the `contents` that explains EVERYTHING it doesn't explain why I'm this retarded though followed this btw https://code.mendhak.com/keepassxc-sign-git-commit-with-ssh/ big shoutout to mendhak :-)
This commit is contained in:
parent
e3ec0b955b
commit
e6461cfd9b
1 changed files with 17 additions and 19 deletions
|
@ -38,26 +38,24 @@ in {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
inherit (cfg) enable userName userEmail;
|
inherit (cfg) enable userName userEmail;
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
contents = {
|
core = {
|
||||||
core = {
|
editor = cfg.editor;
|
||||||
editor = cfg.editor;
|
pager = "${pkgs.delta}/bin/delta";
|
||||||
pager = "${pkgs.delta}/bin/delta";
|
|
||||||
};
|
|
||||||
init.defaultBranch = cfg.defaultBranch;
|
|
||||||
push.autoSetupRemote = true;
|
|
||||||
commit = {
|
|
||||||
verbose = true;
|
|
||||||
gpgSign = true;
|
|
||||||
};
|
|
||||||
gpg.format = "ssh";
|
|
||||||
user.signingKey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXD1EM4mQz99vJhmZX1r7kwMd8yewogOuoTUuv1xWZB";
|
|
||||||
merge.conflictstyle = "zdiff3";
|
|
||||||
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
|
|
||||||
diff.algorithm = "histogram";
|
|
||||||
transfer.fsckobjects = true;
|
|
||||||
fetch.fsckobjects = true;
|
|
||||||
receive.fsckobjects = true;
|
|
||||||
};
|
};
|
||||||
|
init.defaultBranch = cfg.defaultBranch;
|
||||||
|
push.autoSetupRemote = true;
|
||||||
|
commit = {
|
||||||
|
verbose = true;
|
||||||
|
gpgsign = true;
|
||||||
|
};
|
||||||
|
gpg.format = "ssh";
|
||||||
|
user.signingkey = "key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHXD1EM4mQz99vJhmZX1r7kwMd8yewogOuoTUuv1xWZB";
|
||||||
|
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