From d03e27beb66bf1978691e4d14621ec1cf9c2b97a Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Thu, 23 May 2024 10:53:23 +0200
Subject: [PATCH] [Services/GnuPG] use pinentry package option

Greatly simplifies config.
---
 services/gnupg.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/services/gnupg.nix b/services/gnupg.nix
index 6fc8adf..94dfc3b 100644
--- a/services/gnupg.nix
+++ b/services/gnupg.nix
@@ -4,13 +4,14 @@ let
   gpgNoTTY = pkgs.writeShellScriptBin "gpg-no-tty" ''
     exec ${pkgs.gnupg}/bin/gpg --batch --no-tty "$@"
   '';
+  pinentrySwitcher = pkgs.callPackage ../packages/pinentry.nix {};
 in {
   config = {
 
     programs.gnupg = {
       agent.enable = true;
       dirmngr.enable = true;
-      agent.pinentryFlavor = "curses"; # overriden anyway
+      agent.pinentryPackage = pinentrySwitcher;
       agent.enableSSHSupport = true;
       agent.enableExtraSocket = true;
       agent.enableBrowserSocket = true;
@@ -30,17 +31,5 @@ in {
       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
-        '' ];
-    };
   };
 }