diff --git a/nix/hosts/doloro-wsl/home.nix b/nix/hosts/doloro-wsl/home.nix
index f5e4ed2..f76bb11 100644
--- a/nix/hosts/doloro-wsl/home.nix
+++ b/nix/hosts/doloro-wsl/home.nix
@@ -98,5 +98,8 @@
   # Let Home Manager install and manage itself.
   programs = {
     home-manager.enable = true;
+    ssh = {
+      matchBlocks."*".addKeysToAgent = "yes";
+    };
   };
 }
diff --git a/nix/hosts/doloro-wsl/nixos.nix b/nix/hosts/doloro-wsl/nixos.nix
index 25ed98b..7d55bcf 100644
--- a/nix/hosts/doloro-wsl/nixos.nix
+++ b/nix/hosts/doloro-wsl/nixos.nix
@@ -16,7 +16,9 @@
   # rocmSupport = false;
   programs = {
     dconf.enable = true;
-    ssh.startAgent = true;
+    ssh = {
+      startAgent = true;
+    };
   };
   networking.dhcpcd.enable = lib.mkOverride 0 false;
   boot.loader.grub.enable = lib.mkOverride 0 false;
diff --git a/nix/hosts/doloro/home.nix b/nix/hosts/doloro/home.nix
index 92efe85..7ecc15a 100644
--- a/nix/hosts/doloro/home.nix
+++ b/nix/hosts/doloro/home.nix
@@ -119,5 +119,10 @@
   };
   xdg.configFile."mimeapps.list".force = true;
   # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
+  programs = {
+    ssh = {
+      matchBlocks."*".addKeysToAgent = "yes";
+    };
+    home-manager.enable = true;
+  };
 }
diff --git a/nix/hosts/doloro/nixos.nix b/nix/hosts/doloro/nixos.nix
index 8367185..87ef1ee 100644
--- a/nix/hosts/doloro/nixos.nix
+++ b/nix/hosts/doloro/nixos.nix
@@ -168,6 +168,7 @@ in
   programs = {
     ssh = {
       # enable = true;
+      extraConfig = "AddKeysToAgent yes";
       startAgent = true;
     };
     fish.enable = true;