diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix
index 712787aa..947710bd 100644
--- a/modules/crypto/default.nix
+++ b/modules/crypto/default.nix
@@ -16,6 +16,11 @@ 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;
 
@@ -32,9 +37,6 @@ in
       home.packages = [
         gnome.seahorse
         keepassxc
-        libsecret
-        qMasterPassword
-        restic
       ];
     };
   };