1 files changed, 12 insertions, 1 deletions
diff --git a/lib/ssh.nix b/lib/ssh.nix
index 6446a63..c6a73f2 100644
--- a/lib/ssh.nix
+++ b/lib/ssh.nix
@@ -10,8 +10,19 @@ in {
     matchBlocks = {
       "beryllium" = {
         hostname = "beryllium";
+        forwardAgent = true;
+        remoteForwards = let path = a: b: {host.address = a; bind.address = b;};
+        in [
+          ( path
+            "/run/user/1000/gnupg/S.gpg-agent.extra"
+            "/run/user/1000/gnupg/S.gpg-agent.extra"
+          )
+          ( path
+            "/run/user/1000/gnupg/S.gpg-agent"
+            "/run/user/1000/gnupg/S.gpg-agent"
+          )
+        ];
         extraOptions = {
-          "RemoteForward" = "/run/user/1000/gnupg/S.gpg-agent /run/user/1000/gnupg/S.gpg-agent.extra";
           "StreamLocalBindUnlink" = "yes";
         };
       };