aviallon/nixos-lib
1
0
Fork 0
mirror of https://github.com/aviallon/nixos-lib.git synced 2026-04-06 01:38:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Services/GnuPG] use pinentry package option

Browse source 
Greatly simplifies config.
This commit is contained in:
Antoine Viallon 2024-05-23 10:53:23 +02:00
parent eeae546d01
commit d03e27beb6
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
services/gnupg.nix
View file

@ -4,13 +4,14 @@ let
gpgNoTTY = pkgs.writeShellScriptBin "gpg-no-tty" '' gpgNoTTY = pkgs.writeShellScriptBin "gpg-no-tty" ''
exec ${pkgs.gnupg}/bin/gpg --batch --no-tty "$@" exec ${pkgs.gnupg}/bin/gpg --batch --no-tty "$@"
''; '';
pinentrySwitcher = pkgs.callPackage ../packages/pinentry.nix {};
in { in {
config = { config = {
programs.gnupg = { programs.gnupg = {
agent.enable = true; agent.enable = true;
dirmngr.enable = true; dirmngr.enable = true;
agent.pinentryFlavor = "curses"; # overriden anyway agent.pinentryPackage = pinentrySwitcher;
agent.enableSSHSupport = true; agent.enableSSHSupport = true;
agent.enableExtraSocket = true; agent.enableExtraSocket = true;
agent.enableBrowserSocket = true; agent.enableBrowserSocket = true;
@ -30,17 +31,5 @@ in {
gpgNoTTY gpgNoTTY
]; ];
systemd.user.services.gpg-agent = let
pinentrySwitcher = pkgs.callPackage ../packages/pinentry.nix {};
cfg = config.programs.gnupg;
in {
restartTriggers = [ pinentrySwitcher ];
restartIfChanged = true;
serviceConfig.ExecStart = mkOverride 30 [ "" ''
${cfg.package}/bin/gpg-agent --supervised \
--pinentry-program ${pinentrySwitcher}/bin/pinentry
'' ];
};
}; };
} }