diff --git a/fish/config.fish b/fish/config.fish
index 7e2063a..2804a86 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -29,15 +29,10 @@ if test -d "~/repos"
     alias r "cd ~/repos"
 end
 
-# PATH stuff
+# We start the ssh-agent in noah-home.nix, so we'll add the socket to the environment
+set -Ux SSH_AUTH_SOCK /var/run/user/(id -u)/ssh-agent
 
-# Run ssh-agent
-#if test -z "(pgrep ssh-agent)"
-#  eval (ssh-agent -c) > /dev/null # no output
-#  set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK
-#  set -Ux SSH_AGENT_PID $SSH_AGENT_PID
-#  set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK
-#end
+# PATH stuff
 
 if type -q "direnv"
     direnv hook fish | source
diff --git a/noah-home.nix b/noah-home.nix
index e0b0e97..f4fd4b0 100644
--- a/noah-home.nix
+++ b/noah-home.nix
@@ -200,6 +200,7 @@ in
       ".clj-kondo/"
     ];
   };
+
   programs.aerc = {
     enable = true;
     package = unstable.aerc;
@@ -208,6 +209,7 @@ in
   programs.ssh = {
     enable = true;
     extraConfig = builtins.readFile ./ssh/extra;
+    addKeysToAgent = "yes";
   };
 
   services.ssh-agent.enable = true;
diff --git a/services.nix b/services.nix
index ffa0143..3e97099 100644
--- a/services.nix
+++ b/services.nix
@@ -5,7 +5,7 @@
   # programs.mtr.enable = true;
   programs.gnupg.agent = {
     enable = true;
-    enableSSHSupport = true;
+    enableSSHSupport = false;
   };
 
   # Fish shell, the best