diff --git a/home/default.nix b/home/default.nix
index 710a906..98db35f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -63,9 +63,18 @@ in
           keyserver = "hkps://keys.openpgp.org";
         };
       };
+      ssh = {
+        enable = true;
+      };
     };
 
     services.blueman-applet.enable = true;
+    services.gpg-agent = {
+      enable = true;
+      enableExtraSocket = true;
+      enableSshSupport = true;
+      pinentryFlavor = "gnome3";
+    };
 
     xdg.enable = true;
     xdg.mime.enable = true;
diff --git a/home/sway/gnome-keyring.nix b/home/sway/gnome-keyring.nix
index 2312f74..c3bcc63 100644
--- a/home/sway/gnome-keyring.nix
+++ b/home/sway/gnome-keyring.nix
@@ -2,6 +2,4 @@
 
 {
   services.gnome-keyring.enable = true;
-  services.gpg-agent.enable = true;
-  services.gpg-agent.pinentryFlavor = "gnome3";
 }
diff --git a/system/packages.nix b/system/packages.nix
index 333e6f7..4e2304f 100644
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -15,6 +15,12 @@
 
   programs = {
     git.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableExtraSocket = true;
+      enableSSHSupport = true;
+      pinentryFlavor = "gnome3";
+    };
     neovim = {
       enable = true;
       defaultEditor = true;