From 582602fe82492cfdda7c8d7390e5ec783a9f5492 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Thu, 27 Mar 2025 14:58:38 -0400
Subject: [PATCH] ssh agent proper setup

---
 home-manager/machines/crash/home.nix        |  1 +
 home-manager/modules/programs/ssh-agent.nix | 17 +++++++++++++++++
 home-manager/modules/programs/ssh.nix       | 12 +++++++-----
 3 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 home-manager/modules/programs/ssh-agent.nix

diff --git a/home-manager/machines/crash/home.nix b/home-manager/machines/crash/home.nix
index b57d562..f16278b 100644
--- a/home-manager/machines/crash/home.nix
+++ b/home-manager/machines/crash/home.nix
@@ -32,6 +32,7 @@
                 ../../modules/programs/core.nix
                 ../../modules/programs/devel.nix
                 ../../modules/programs/ssh.nix
+                ../../modules/programs/ssh-agent.nix
                 (import ../../modules/programs/emacs.nix {})
                 ../../modules/programs/fonts.nix
                 ../../modules/programs/desktop.nix
diff --git a/home-manager/modules/programs/ssh-agent.nix b/home-manager/modules/programs/ssh-agent.nix
new file mode 100644
index 0000000..73d9324
--- /dev/null
+++ b/home-manager/modules/programs/ssh-agent.nix
@@ -0,0 +1,17 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  # Enable the agent
+  services.ssh-agent = {
+    enable = true;
+  };
+  # Setup fish init
+  programs.fish.shellInit =
+    ''
+    set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent
+    ssh-add
+'';
+}
diff --git a/home-manager/modules/programs/ssh.nix b/home-manager/modules/programs/ssh.nix
index 4896613..65a00bc 100644
--- a/home-manager/modules/programs/ssh.nix
+++ b/home-manager/modules/programs/ssh.nix
@@ -4,9 +4,6 @@
   pkgs,
   ...
 }: {
-  services.ssh-agent = {
-   enable = true;
-  };
   programs.ssh = {
     # SSH configuration
     enable = true;
@@ -19,10 +16,14 @@
     # enable session reuse
     controlMaster = "auto";
     controlPersist = "10m";
-    # setup agent
-    addKeysToAgent = "yes";
     # Configure known hosts
     matchBlocks = {
+      # rsync.net
+      "de1955" = {
+        hostname = "de1955.rsync.net";
+        user = "de1955";
+      };
+      # my nixos machines
       "tides" = {
         hostname = "150.136.87.190";
         forwardAgent = true;
@@ -31,6 +32,7 @@
         hostname = "driftwood.stranger.systems";
         forwardAgent = true;
       };
+      # Other Machines
       "static.stranger.systems" = {
         hostname = "129.153.226.221";
         user = "ubuntu";