diff --git a/hosts/doloro-laptop/nixos.nix b/hosts/doloro-laptop/nixos.nix
index 8928719..d853a01 100644
--- a/hosts/doloro-laptop/nixos.nix
+++ b/hosts/doloro-laptop/nixos.nix
@@ -71,6 +71,19 @@ in
       # intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe
     ];
   };
+  programs.ssh = {
+    # enable = true;
+    startAgent = true;
+
+    matchBlocks = {
+      "*" = {
+        addKeysToAgent = "yes";
+        identityFile = [
+          "~/.ssh/id_ed25519"
+        ];
+      };
+    };
+  };
   services.openssh = {
     enable = true;
     settings = {
diff --git a/hosts/doloro/nixos.nix b/hosts/doloro/nixos.nix
index 93d1195..dc9500e 100644
--- a/hosts/doloro/nixos.nix
+++ b/hosts/doloro/nixos.nix
@@ -229,8 +229,16 @@ in
   programs = {
     ssh = {
       # enable = true;
-      extraConfig = "AddKeysToAgent yes";
       startAgent = true;
+
+      matchBlocks = {
+        "*" = {
+          addKeysToAgent = "yes";
+          identityFile = [
+            "~/.ssh/id_ed25519"
+          ];
+        };
+      };
     };
     fish.enable = true;
   };