fix(gpg): pinentryFlavor has been deprecated

EdenEast · Apr 5, 2024 · 529b052 · 529b052
1 parent 23e3ace
commit 529b052
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/system/nixos/modules/yubikey/default.nix b/system/nixos/modules/yubikey/default.nix
@@ -8,10 +8,10 @@ in
   options.nyx.modules.yubikey = {
     enable = mkEnableOption "yubikey support";
     istty = mkEnableOption "Set pinentry to curses if no display";
-    pinentryFlavor = mkOption {
-      type = types.nullOr (types.enum pkgs.pinentry.flavors);
+    pinentryPackage = mkOption {
+      type = types.nullOr types.package;
       default = null;
-      description = "Pinentry Flavor";
+      description = "Pinentry Package";
     };
   };
 
@@ -24,7 +24,7 @@ in
     programs.gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
-      pinentryFlavor = if cfg.pinentryFlavor != null then cfg.pinentryFlavor else if cfg.istty then "curses" else "qt";
+      pinentryPackage = cfg.pinentryPackage;
     };
     # environment.shellInit = ''
     #   export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"

diff --git a/system/nixos/profiles/desktop/default.nix b/system/nixos/profiles/desktop/default.nix
@@ -23,6 +23,8 @@ in
   };
 
   config = mkIf cfg.enable {
+    nyx.modules.yubikey.pinentryPackage = pkgs.pinentry-qt;
+
     services.printing.enable = true;
 
     environment.systemPackages = with pkgs; [