mirror of
https://github.com/ellmau/nixos.git
synced 2025-12-19 09:29:36 +01:00
Add programs.git.extraConfig.commit.gpgsign
programs.git.signing.signByDefault sets another program than gpgsm and introduces conflicting definitions
This commit is contained in:
parent
249b050e84
commit
015b448ef0
@ -96,7 +96,6 @@ with lib; {
|
|||||||
programs.git = {
|
programs.git = {
|
||||||
userEmail = meta.mailAddress;
|
userEmail = meta.mailAddress;
|
||||||
userName = meta.description;
|
userName = meta.description;
|
||||||
signing.signByDefault = meta.git.signDefault;
|
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
gpg = lib.mkIf meta.git.gpgsm {
|
gpg = lib.mkIf meta.git.gpgsm {
|
||||||
format = "x509";
|
format = "x509";
|
||||||
@ -105,6 +104,9 @@ with lib; {
|
|||||||
user = {
|
user = {
|
||||||
signingKey = meta.git.key;
|
signingKey = meta.git.key;
|
||||||
};
|
};
|
||||||
|
commit = {
|
||||||
|
gpgsign = meta.git.signDefault;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user