From 255186fa10c17f1bbadf3322744073c1bfdf16e9 Mon Sep 17 00:00:00 2001
From: Phil Pluckthun <phil@kitten.sh>
Date: Sat, 6 Sep 2025 23:16:42 +0100
Subject: [PATCH] Revert pinentry fork

---
 home/base/gpg.nix             |  5 ++---
 lib/pkgs/pinentry-touchid.nix | 15 +++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/home/base/gpg.nix b/home/base/gpg.nix
index 70ccaae..96e9ac5 100644
--- a/home/base/gpg.nix
+++ b/home/base/gpg.nix
@@ -32,11 +32,10 @@ in {
       enableSshSupport = true;
       enableScDaemon = false;
       verbose = true;
-      defaultCacheTtl = 20;
-      defaultCacheTtlSsh = 20;
+      defaultCacheTtl = 10;
+      defaultCacheTtlSsh = 10;
       maxCacheTtl = 60;
       maxCacheTtlSsh = 60;
-      noAllowExternalCache = true;
       pinentry = mkMerge [
         (helpers.mkIfDarwin {
           package = pkgs.pinentry-touchid;
diff --git a/lib/pkgs/pinentry-touchid.nix b/lib/pkgs/pinentry-touchid.nix
index 48d761b..5c8c86e 100644
--- a/lib/pkgs/pinentry-touchid.nix
+++ b/lib/pkgs/pinentry-touchid.nix
@@ -8,29 +8,28 @@ self: pkgs @ {
 with lib;
 buildGoModule rec {
   pname = "pinentry-touchid";
-  version = "v0.0.5";
-  vendorHash = "sha256-3NeKIdsZ7uQQmVXDZ6zUQ0QMF4uxFcUDEOHbPSqoqOg=";
+  version = "v0.0.4";
+  vendorHash = "sha256-v3JtUk94/javwhtUsPUFV9EwFfaixZpb4AqKpCEaZp4=";
   proxyVendor = true;
 
   doCheck = false;
   doInstallCheck = true;
 
   src = fetchFromGitHub {
-    owner = "kitten";
+    owner = "lujstn";
     repo = "pinentry-touchid";
-    rev = "07322ff7e6509a575ce282aeb3b47db74a142a18";
-    sha256 = "sha256-anSdpuUbB1VIIaU28kIqLjsdIEAgHxgzSf0g68MK2as=";
+    rev = "v0.0.4";
+    sha256 = "sha256-2+AuUbyA1CZQROjX/Wlcx+OVsvOQgli5oPjAEdKB1Gk=";
   };
 
   subPackages = [ "." ];
   buildInputs = with pkgs; [ makeBinaryWrapper ];
-  nativeBuildInputs = with pkgs; [ pinentry_mac writableTmpDirAsHomeHook ];
+  nativeBuildInputs = with pkgs; [ pinentry_mac ];
   ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ];
 
   patchPhase = ''
     substituteInPlace go.mod \
-      --replace-fail "=> ./go-assuan" "=> $src/go-assuan" \
-      --replace-fail "=> ./go-touchid" "=> $src/go-touchid"
+      --replace-fail "=> ./go-assuan" "=> $src/go-assuan"
   '';
 
   postInstall = ''
-- 
knotmirror 0.0.1