diff --git a/home-manager/common/software/cli/gpg.nix b/home-manager/common/software/cli/gpg.nix
index 76664a1a..bd05ef25 100644
--- a/home-manager/common/software/cli/gpg.nix
+++ b/home-manager/common/software/cli/gpg.nix
@@ -1,4 +1,11 @@
 { ... }: {
+  programs.gpg = {
+    enable = true;
+    enableExtraSocket = true;
+    enableSSHSupport = true;
+    pinentryFlavor = "curses";
+  };
+
   programs.gpg = {
     enable = true;
     settings = {
diff --git a/home-manager/common/software/cli/ssh.nix b/home-manager/common/software/cli/ssh.nix
index 7717205e..82204bf3 100644
--- a/home-manager/common/software/cli/ssh.nix
+++ b/home-manager/common/software/cli/ssh.nix
@@ -5,6 +5,7 @@
   Host 192.168.1.210
     StrictHostKeyChecking no
   Host framework-server
+    ForwardAgent yes
     StreamLocalBindUnlink yes
   '';
 }