diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix
index 3580765..94902ba 100644
--- a/modules/crypto/default.nix
+++ b/modules/crypto/default.nix
@@ -9,21 +9,21 @@ with lib; let
 in {
   services.dbus.packages = [pkgs.gcr];
   services.pcscd.enable = true;
-
   services.udev.packages = [pkgs.yubikey-personalization];
-  services.yubikey-agent.enable = true;
-  hardware.gpgSmartcards.enable = true; # for yubikey
-
   services.gnome.gnome-keyring.enable = true;
 
+  hardware.gpgSmartcards.enable = true; # for yubikey
+
   users.users."${psCfg.user.name}".packages = with pkgs; [
     libsecret
     gnupg
   ];
 
+  programs.ssh.startAgent = false;
   programs.gnupg.agent = {
     enable = true;
-    enableSSHSupport = false;
+    enableSSHSupport = true;
+    enableExtraSocket = true;
     pinentryFlavor = "gnome3";
   };