gpg-agent: add extraConfig option

This commit is contained in:
Tad Fisher 2018-08-18 11:57:09 -07:00 committed by Robert Helgesson
parent 29191eb2c7
commit 26342588ab
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 26 additions and 0 deletions

View file

@ -739,6 +739,17 @@ in
A new module is available: 'programs.fish'. A new module is available: 'programs.fish'.
''; '';
} }
{
time = "2018-08-18T19:03:42+00:00";
condition = config.services.gpg-agent.enable;
message = ''
A new option is available: 'services.gpg-agent.extraConfig'.
Extra lines may be appended to $HOME/.gnupg/gpg-agent.conf
using this option.
'';
}
]; ];
}; };
} }

View file

@ -108,6 +108,19 @@ in
<option>disable-scdaemon</option> setting to gpg-agent. <option>disable-scdaemon</option> setting to gpg-agent.
''; '';
}; };
extraConfig = mkOption {
type = types.lines;
default = "";
example = ''
allow-emacs-pinentry
allow-loopback-pinentry
'';
description = ''
Extra configuration lines to append to the gpg-agent
configuration file.
'';
};
}; };
}; };
@ -131,6 +144,8 @@ in
++ ++
optional (cfg.maxCacheTtlSsh != null) optional (cfg.maxCacheTtlSsh != null)
"max-cache-ttl-ssh ${toString cfg.maxCacheTtlSsh}" "max-cache-ttl-ssh ${toString cfg.maxCacheTtlSsh}"
++
[ cfg.extraConfig ]
); );
home.sessionVariables = home.sessionVariables =