From bf21988cc8309e65b4c217227f5f9421f51df733 Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Mon, 11 Sep 2023 13:17:49 +0200
Subject: [PATCH] add pinentry

---
 modules/nitrokey-ssh-gpg.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/nitrokey-ssh-gpg.nix b/modules/nitrokey-ssh-gpg.nix
index aa98dae..1d078cc 100644
--- a/modules/nitrokey-ssh-gpg.nix
+++ b/modules/nitrokey-ssh-gpg.nix
@@ -17,13 +17,11 @@
   # Otherwise there might be a gpg error about "no pinentry".
   # https://discourse.nixos.org/t/cant-get-gnupg-to-work-no-pinentry/15373/19
   # But how to restart it? Maybe this?
+  # killall gpg-agent
   # systemctl --user restart gpg-agent
 
   # Not sure if this is needed: Reload udev rules.
   # sudo -- udevadm control --reload-rules && udevadm trigger
-  #
-  # Not sure if this is needed:
-  # killall gpg-agent
 
   # TODO: gpg-agent pinentry problem
   # https://github.com/NixOS/nixpkgs/issues/97861
@@ -88,10 +86,14 @@
 #      pinentry-gnome
 #    ];
 #  };
-#  environment.systemPackages = with pkgs; [
-#    #pinentry-curses
-#    pinentry-gnome
-#  ];
+
+  # Adds the pinentry binary to the PATH so that e.g.
+  #   echo GETPIN | pinentry
+  # works.
+  environment.systemPackages = with pkgs; [
+    #pinentry-curses
+    pinentry-gnome
+  ];
 
   # Smartcard daemon.
   services.pcscd.enable = true;