From db88a44435fcf0e32745cd39d98b9b96928e9140 Mon Sep 17 00:00:00 2001
From: OlivierChiasson <olivierchiasson@hotmail.fr>
Date: Wed, 15 Jul 2026 18:20:40 -0300
Subject: [PATCH] refactor(ssh): centralize identity file logic and optimize
 host selection

Refactor the SSH configuration generation to reduce duplication and
improve efficiency.

- Extract `IdentityFile` line generation into a shared variable in
  `ssh-inventory.nix` to ensure consistency between per-host and
  gitea blocks.
- Optimize `selectedHosts` resolution in `home-manager/default.nix`
  by reusing `activeHosts` when the "all" wildcard is used.
- Tighten IPv4 regex matching in `ssh-inventory.nix` using anchors.
- Update `users-merge.nix` to propagate `extraIdentities` to the
  rbw outbound configuration.
- Set default `authorizedHosts` to "all" for inbound SSH users.
---
 modules/lib/ssh-inventory.nix        | 9 ++++++---
 modules/lib/users-merge.nix          | 1 +
 modules/ssh/home-manager/default.nix | 9 ++++++++-
 modules/system/users.nix             | 1 +
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/modules/lib/ssh-inventory.nix b/modules/lib/ssh-inventory.nix
index b0a9398..8fc7a8d 100644
--- a/modules/lib/ssh-inventory.nix
+++ b/modules/lib/ssh-inventory.nix
@@ -57,7 +57,7 @@
       # parses as an IPv4 dotted-quad. Filters out scratchpad/non-routable
       # entries (e.g. `hostName = "test"`).
       activeHosts = lib.filterAttrs
-        (_: h: lib.match "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+" h.hostName != null)
+        (_: h: lib.match "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$" h.hostName != null)
         hosts;
 
       # .pub filename convention. OpenSSH 7.3+ accepts a `.pub` file as
@@ -78,6 +78,10 @@
           identityAgent ? "SSH_AUTH_SOCK",
         }:
         let
+          # Shared `IdentityFile` filter line (when `user` is set). Used by
+          # both the per-host and gitea blocks so the two can't drift apart.
+          idLine = lib.optionalString (user != null) "  IdentityFile ~/${mkIdentityFileName user}\n";
+
           # Match blocks for cross-account SSH. Filter out cfg.user since
           # the matching pub is already loaded via the Host block's
           # IdentityFile line — re-emitting it would just duplicate.
@@ -97,7 +101,6 @@
             let
               e = selectedHosts.${hostName};
               hostPatterns = lib.concatStringsSep " " (e.aliases ++ [ e.hostName ]);
-              idLine = if user == null then "" else "  IdentityFile ~/${mkIdentityFileName user}\n";
             in ''
               Host ${hostPatterns}
                 HostName ${e.hostName}
@@ -114,7 +117,7 @@
               HostName 192.168.2.238
               Port 222
               User git
-            ${if user == null then "" else "  IdentityFile ~/${mkIdentityFileName user}\n"}  IdentityAgent ${identityAgent}
+            ${idLine}  IdentityAgent ${identityAgent}
               IdentitiesOnly yes
           '';
 
diff --git a/modules/lib/users-merge.nix b/modules/lib/users-merge.nix
index bdc08f3..045d586 100644
--- a/modules/lib/users-merge.nix
+++ b/modules/lib/users-merge.nix
@@ -60,6 +60,7 @@
           chiasson.ssh.outbound.rbw.user = name;
           chiasson.ssh.outbound.rbw.hosts =
             if (outboundCfg.hosts or "all") == "all" then [ "all" ] else outboundCfg.hosts;
+          chiasson.ssh.outbound.rbw.extraIdentities = outboundCfg.extraIdentities or [ ];
         };
 
       mkHmUserModule =
diff --git a/modules/ssh/home-manager/default.nix b/modules/ssh/home-manager/default.nix
index 3610cbf..c68cae6 100644
--- a/modules/ssh/home-manager/default.nix
+++ b/modules/ssh/home-manager/default.nix
@@ -12,6 +12,13 @@
         else
           cfg.hosts;
       missingHosts = builtins.filter (name: !(builtins.hasAttr name inventory.hosts)) selectedHostNames;
+      # Resolve to the actual host attrs for the template. The "all" case
+      # reuses `activeHosts` directly instead of rebuilding the same attrset.
+      selectedHosts =
+        if cfg.hosts == [ "all" ] then
+          inventory.activeHosts
+        else
+          builtins.listToAttrs (map (n: { name = n; value = inventory.hosts.${n}; }) selectedHostNames);
       # All identities this HM user may authenticate AS: cfg.user ∪
       # extraIdentities. `cfg.user` can be null (e.g. user not in inventory
       # yet) — in that case the Host-block IdentityFile line is suppressed
@@ -112,7 +119,7 @@
           }
           (lib.mkIf cfg.manageSshConfig {
             home.file.".ssh/config".text = inventory.mkSshConfigTemplate {
-              selectedHosts = builtins.listToAttrs (map (n: { name = n; value = inventory.hosts.${n}; }) selectedHostNames);
+              inherit selectedHosts;
               user = cfg.user;
               inherit (cfg) extraIdentities;
             };
diff --git a/modules/system/users.nix b/modules/system/users.nix
index 4a225af..cda8fcf 100644
--- a/modules/system/users.nix
+++ b/modules/system/users.nix
@@ -156,6 +156,7 @@
               createHome = false;
               homeManager = { enable = false; module = null; };
               ssh.inbound.enable = true;
+              ssh.inbound.authorizedHosts = "all";
             };
           };