From 74002134090988a10bf7d3e6fb81e5bcd48f7990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Mon, 20 Jul 2026 16:03:03 +0200
Subject: [PATCH] New ssh config style

---
 home/Aloria.nix      | 2 +-
 home/Arendia.nix     | 2 +-
 home/Arm.nix         | 2 +-
 home/Asturia.nix     | 2 +-
 home/Kell.nix        | 2 +-
 home/Mallorea.nix    | 2 +-
 home/Pi.nix          | 2 +-
 home/Riva.nix        | 2 +-
 home/Tolnedra.nix    | 2 +-
 home/Vault.nix       | 2 +-
 home/ssh/default.nix | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/home/Aloria.nix b/home/Aloria.nix
index aa95ed3..e33674e 100644
--- a/home/Aloria.nix
+++ b/home/Aloria.nix
@@ -22,7 +22,7 @@ in {
     (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
   ];
 
-  programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
 
   home.packages = with pkgs; [
     jetbrains.pycharm
diff --git a/home/Arendia.nix b/home/Arendia.nix
index 2067a17..ca5d7f6 100644
--- a/home/Arendia.nix
+++ b/home/Arendia.nix
@@ -22,7 +22,7 @@ in {
     (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
   ];
 
-  programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Arendia/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Arendia/id_ed25519";
 
   home.packages = with pkgs; [
     rclone
diff --git a/home/Arm.nix b/home/Arm.nix
index fb8c481..d56167b 100644
--- a/home/Arm.nix
+++ b/home/Arm.nix
@@ -18,7 +18,7 @@ in {
     (import ./utils/common.nix {inherit inputs config pkgs;})
     ./ssh
   ];
-  programs.ssh.matchBlocks."*".identityFile = "/home/ubuntu/.secrets/SSH/Arm/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/ubuntu/.secrets/SSH/Arm/id_ed25519";
 
   home.sessionVariables = {
     NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
diff --git a/home/Asturia.nix b/home/Asturia.nix
index 56a2464..37d19a5 100644
--- a/home/Asturia.nix
+++ b/home/Asturia.nix
@@ -8,7 +8,7 @@
     (import ./utils/desktop.nix {inherit inputs config pkgs;})
   ];
 
-  programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Asturia/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Asturia/id_ed25519";
 
   home.packages = with pkgs; [
     distrobox
diff --git a/home/Kell.nix b/home/Kell.nix
index d4ee881..46ba134 100644
--- a/home/Kell.nix
+++ b/home/Kell.nix
@@ -21,7 +21,7 @@ in {
     (import ./utils/desktop.nix {inherit inputs config pkgs;})
     (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
   ];
-  programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Kell/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Kell/id_ed25519";
 
   dconf.settings = {
     "org/virt-manager/virt-manager/connections" = {
diff --git a/home/Mallorea.nix b/home/Mallorea.nix
index 17bee93..53f1fdf 100644
--- a/home/Mallorea.nix
+++ b/home/Mallorea.nix
@@ -91,7 +91,7 @@ in {
     (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
     ./ssh
   ];
-  programs.ssh.matchBlocks."*".identityFile = "${home_dir}/.secrets/SSH/Mallorea/id_ed25519";
+  programs.ssh.settings."*".identityFile = "${home_dir}/.secrets/SSH/Mallorea/id_ed25519";
 
   home.sessionVariables = {
     NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
diff --git a/home/Pi.nix b/home/Pi.nix
index e8bad9b..eb6c06b 100644
--- a/home/Pi.nix
+++ b/home/Pi.nix
@@ -18,7 +18,7 @@ in {
     (import ./utils/common.nix {inherit inputs config pkgs;})
     ./ssh
   ];
-  programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Pi/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Pi/id_ed25519";
 
   home.sessionVariables = {
     NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
diff --git a/home/Riva.nix b/home/Riva.nix
index 4fb9e06..7ad6d83 100644
--- a/home/Riva.nix
+++ b/home/Riva.nix
@@ -21,5 +21,5 @@ in {
     ./ssh
   ];
 
-  programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Riva/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Riva/id_ed25519";
 }
diff --git a/home/Tolnedra.nix b/home/Tolnedra.nix
index 33ded27..c43512e 100644
--- a/home/Tolnedra.nix
+++ b/home/Tolnedra.nix
@@ -21,7 +21,7 @@
     ./ssh
   ];
 
-  programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Tolnedra/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/user/.secrets/SSH/Tolnedra/id_ed25519";
 
   home.packages = with pkgs; [
     wl-clipboard
diff --git a/home/Vault.nix b/home/Vault.nix
index a6c2311..8be3f83 100644
--- a/home/Vault.nix
+++ b/home/Vault.nix
@@ -69,7 +69,7 @@ in {
     ./ssh
   ];
 
-  programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Vault/id_ed25519";
+  programs.ssh.settings."*".identityFile = "/home/server/.secrets/SSH/Vault/id_ed25519";
 
   home.sessionVariables = {
     NIX_PATH = "${config.xdg.stateHome}/nix/profiles/channels/";
diff --git a/home/ssh/default.nix b/home/ssh/default.nix
index 21d30e9..ff0e88e 100644
--- a/home/ssh/default.nix
+++ b/home/ssh/default.nix
@@ -7,7 +7,7 @@
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false;
-    matchBlocks = {
+    settings = {
       "*" = {
         host = "*";
       };