diff --git a/home-manager.nix b/home-manager.nix
index 5135fe0..6762d29 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -54,9 +54,6 @@ in {
           GOPATH = "\${HOME}";
           PATH = "\${PATH}:\${HOME}/bin";
 
-          GPG_TTY = "$(tty)";
-          SSH_AUTH_SOCK = "$(gpgconf --list-dirs agent-ssh-socket)";
-
           ZSH_TMUX_AUTOSTART = "true";
           ZSH_TMUX_AUTOCONNECT = "true";
         };
@@ -69,7 +66,6 @@ in {
         };
 
         initExtra = ''
-          gpgconf --launch gpg-agent
           which apt >/dev/null 2>&1 && plugins=("\$\{(@)plugins:#tmux-my\}")
         '';
       };
@@ -85,6 +81,7 @@ in {
     services = {
       gpg-agent = {
         enable = true;
+        enableSshSupport = true;
       };
     };