summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Sima <ben@bsima.me>2023-07-28 21:01:52 -0400
committerBen Sima <ben@bsima.me>2023-07-28 21:03:24 -0400
commit9fb03fe577a1af1b2d40f1d7f182b0c12ee97430 (patch)
tree35dda3718fc5894ffb6669e302bca3114ddb73e9
parent256a7f2c84050ab694ed0996dbc70647d1b958fd (diff)
Properly forward gpg socket, I think
Change-Id: Icd6d3fb8c2e91d7bcd27a314b37456deafbc114e
-rw-r--r--lib/linux.nix2
-rw-r--r--lib/ssh.nix3
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";