From 9fb03fe577a1af1b2d40f1d7f182b0c12ee97430 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Fri, 28 Jul 2023 21:01:52 -0400
Subject: Properly forward gpg socket, I think

Change-Id: Icd6d3fb8c2e91d7bcd27a314b37456deafbc114e
---
 lib/linux.nix | 2 --
 lib/ssh.nix   | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/linux.nix b/lib/linux.nix
index 77d48d3..86b43ff 100644
--- a/lib/linux.nix
+++ b/lib/linux.nix
@@ -331,8 +331,6 @@ in
       verbose = true;
       extraConfig = ''
         allow-emacs-pinentry
-        # StreamLocalBindUnlink yes
-        # RemoteForward /home/ben/.gnupg/S.gpg-agent /home/ben/.gnupg/S.gpg-agent.extra
       '';
     };
   };
diff --git a/lib/ssh.nix b/lib/ssh.nix
index 29cb677..41c531c 100644
--- a/lib/ssh.nix
+++ b/lib/ssh.nix
@@ -7,6 +7,9 @@ in {
     controlMaster = "auto";
     enable = true;
     forwardAgent = true;
+    extraConfig = ''
+      RemoteForward %d/.gnupg/S.gpg-agent ''${HOME}/.gnupg/S.gpg-agent.extra
+    '';
     matchBlocks = {
       "github.com" = {
         hostname = "github.com";
-- 
cgit v1.2.3