Skip to content

nixos/gnupg: fix gpg-agent when pinentryFlavor is null #240708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rnhmjoj merged 2 commits into from
Jun 30, 2023
Merged

nixos/gnupg: fix gpg-agent when pinentryFlavor is null #240708

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d4f306
nixos/gnupg: fix gpg-agent when pinentryFlavor is null
corngood Jun 30, 2023
d19ab9f
nixos/gnupg: fix pinentryFlavor documentation and add release note
corngood Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions nixos/modules/programs/gnupg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,13 @@ in
};

config = mkIf cfg.agent.enable {
environment.etc."gnupg/gpg-agent.conf".text = ''
environment.etc."gnupg/gpg-agent.conf".text =
lib.optionalString (cfg.agent.pinentryFlavor != null) ''
pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry
'';

# This overrides the systemd user unit shipped with the gnupg package
systemd.user.services.gpg-agent = mkIf (cfg.agent.pinentryFlavor != null) {
systemd.user.services.gpg-agent = {
unitConfig = {
Description = "GnuPG cryptographic agent and passphrase cache";
Documentation = "man:gpg-agent(1)";
Expand Down