nixos/ssh: add the systemd-ssh-proxy include directive to the Host * block

Otherwise, then any Host or Match block in the extraConfig will absorb the include

r-vdp 57d91c53 5f833dd4

Changed files
+2 -2
nixos
modules
programs
+2 -2
nixos/modules/programs/ssh.nix
···
# Custom options from `extraConfig`, to override generated options
${cfg.extraConfig}
${lib.optionalString cfg.systemd-ssh-proxy.enable ''
# See systemd-ssh-proxy(1)
Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
''}
-
# Generated options from other settings
-
Host *
GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}
${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}
···
# Custom options from `extraConfig`, to override generated options
${cfg.extraConfig}
+
# Generated options from other settings
+
Host *
${lib.optionalString cfg.systemd-ssh-proxy.enable ''
# See systemd-ssh-proxy(1)
Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
''}
GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}
${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}