diff --git a/modules/system.nix b/modules/system.nix
index d397833..38c2bbd 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -76,4 +76,18 @@
     enable = true;
     enableExtraSocket = true;
   };
+
+  systemd.user.sockets.gpg-agent-ssh = {
+    wantedBy = [ "sockets.target" ];
+
+    unitConfig.Description = "GPG ssh socket";
+
+    socketConfig = {
+      ListenStream = "%t/gnupg/S.gpg-agent.ssh";
+      FileDescriptorName = "ssh";
+      Service = "gpg-agent.service";
+      SocketMode = "0600";
+      DirectoryMode = "0700";
+    };
+  };
 }