From 37888230728dc1dfea57754ec5309d9048c49947 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Tue, 14 Jan 2025 17:39:03 +0100
Subject: [PATCH] Simplify `pinentry-rofi` usage

---
 hmModules/gpg/default.nix | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/hmModules/gpg/default.nix b/hmModules/gpg/default.nix
index a894c90..f245f26 100644
--- a/hmModules/gpg/default.nix
+++ b/hmModules/gpg/default.nix
@@ -2,25 +2,13 @@
 {
   services.gpg-agent = {
     enable = true;
-    enableSshSupport = true;
-    extraConfig =
-      let
-        pinentryRofi = pkgs.writeShellApplication {
-          name = "pinentry-rofi-with-env";
-          runtimeInputs = with pkgs; [
-            coreutils
-            rofi-wayland
-          ];
-          text = ''
-            "${pkgs.pinentry-rofi}/bin/pinentry-rofi" "$@"
-          '';
-        };
-      in
-      ''
-        allow-emacs-pinentry
-        allow-loopback-pinentry
-        pinentry-program ${pinentryRofi}/bin/pinentry-rofi-with-env
-      '';
+    pinentryPackage = pkgs.pinentry-rofi.override {
+      rofi = pkgs.rofi-wayland;
+    };
+    extraConfig = ''
+      allow-emacs-pinentry
+      allow-loopback-pinentry
+    '';
   };
 
   programs.gpg = {