Commit 8ea64499 authored by David McFarland's avatar David McFarland
Browse files

nixos/gpg-agent: move pinentry-program to /etc/gnupg/gpg-agent.conf

parent 51fd0092

nixos/modules/programs/gnupg.nix

+5 −4
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ in 
  };



  config = mkIf cfg.agent.enable {

    environment.etc."gnupg/gpg-agent.conf".text = ''

      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) {

      unitConfig = {
@@ -101,10 +105,7 @@ in 
        Requires = [ "gpg-agent.socket" ];

      };

      serviceConfig = {

        ExecStart = ''

          ${cfg.package}/bin/gpg-agent --supervised \

            --pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry

        '';

        ExecStart = "${cfg.package}/bin/gpg-agent --supervised";

        ExecReload = "${cfg.package}/bin/gpgconf --reload gpg-agent";

      };

    };