From 102ae3fe62df9d59a08554209a0ebf41b693ed7e Mon Sep 17 00:00:00 2001
From: Jakob Lechner <mail@jalr.de>
Date: Wed, 22 May 2024 22:31:31 +0200
Subject: [PATCH] Fix pinentry deprecations

---
 home-manager/modules/gui.nix | 2 --
 modules/yubikey-gpg.nix      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/home-manager/modules/gui.nix b/home-manager/modules/gui.nix
index 35eb065..d744a18 100644
--- a/home-manager/modules/gui.nix
+++ b/home-manager/modules/gui.nix
@@ -3,11 +3,9 @@ lib.mkIf nixosConfig.jalr.gui.enable {
   home.packages = with pkgs; [
     evince
     exiftool
-    gcr # required for pinentry-gnome
     geeqie
     mpv
     networkmanagerapplet
-    pinentry-gnome
     streamlink
     supersonic-wayland
     vlc
diff --git a/modules/yubikey-gpg.nix b/modules/yubikey-gpg.nix
index 5582a8c..449172e 100644
--- a/modules/yubikey-gpg.nix
+++ b/modules/yubikey-gpg.nix
@@ -7,7 +7,7 @@
       gnupg.agent = {
         enable = true;
         enableSSHSupport = true;
-        pinentryFlavor = if config.jalr.gui.enable then "gnome3" else "tty";
+        pinentryPackage = with pkgs; if config.jalr.gui.enable then pinentry-gnome3 else pinentry-tty;
       };
     };