diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix
index 8dad1d70..af37ebe2 100644
--- a/modules/crypto/default.nix
+++ b/modules/crypto/default.nix
@@ -19,12 +19,17 @@ in {
 
     services.gnome.gnome-keyring.enable = true;
 
+    environment.shellInit = ''
+      gpg-connect-agent /bye
+      export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+    '';
     home-manager = with pkgs;
       pkgs.lib.setAttrByPath ["users" psCfg.user.name] {
         systemd.user.services.polkit-gnome-authentication-agent = import ./polkit-gnome-authentication-agent.service.nix pkgs;
 
         services.gpg-agent = {
           enable = true;
+          enableSshSupport = true;
           pinentryFlavor = "gnome3";
           verbose = true;
         };
@@ -36,10 +41,7 @@ in {
         home.packages = [
           gnome.seahorse
           keepassxc
-          libsecret
-          qMasterPassword
-          restic
         ];
-      };
+    };
   };
 }