From 9f33922eec5ac7d1b36eead65d4bf5d81da87f95 Mon Sep 17 00:00:00 2001
From: Alejandro Angulo <iam@alejandr0angul0.dev>
Date: Sun, 26 Nov 2023 09:55:40 -0800
Subject: [PATCH] Fixed pinentry appearing in wrong terminal

---
 modules/nixos/tools/gpg/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/nixos/tools/gpg/default.nix b/modules/nixos/tools/gpg/default.nix
index b0312f5..5520609 100644
--- a/modules/nixos/tools/gpg/default.nix
+++ b/modules/nixos/tools/gpg/default.nix
@@ -25,6 +25,11 @@ in {
         };
       };
 
+      programs.ssh.matchBlocks = {
+        # Fix for pinentry showing up in wrong terminal
+        "*".match = "host * exec \"gpg-connect-agent UPDATESTARTUPTTY /bye\"";
+      };
+
       services.gpg-agent = {
         enable = true;
         pinentryFlavor = "curses";