fix: ssh port expression only nixos configurations

khaneliman · Oct 11, 2023 · 94ed190 · 94ed190
1 parent 01b42ec
commit 94ed190
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/modules/home/tools/ssh/default.nix b/modules/home/tools/ssh/default.nix
@@ -43,13 +43,14 @@ let
                 RemoteForward /run/user/${remote-user-id}/gnupg/S.gpg-agent /run/user/${user-id}/gnupg/S.gpg-agent.extra
                 RemoteForward /run/user/${remote-user-id}/gnupg/S.gpg-agent.ssh /run/user/${user-id}/gnupg/S.gpg-agent.ssh
               '';
+          port-expr = if builtins.hasAttr name inputs.self.nixosConfigurations then "Port ${builtins.toString cfg.port}" else "";
         in
         ''
           Host ${name}
             Hostname ${name}.local
             User ${remote-user-name}
             ForwardAgent yes
-            Port ${builtins.toString cfg.port}
+            ${port-expr}
             ${forward-gpg}
         ''
       )

diff --git a/modules/nixos/services/openssh/default.nix b/modules/nixos/services/openssh/default.nix
@@ -43,13 +43,14 @@ let
                 RemoteForward /run/user/${remote-user-id}/gnupg/S.gpg-agent /run/user/${user-id}/gnupg/S.gpg-agent.extra
                 RemoteForward /run/user/${remote-user-id}/gnupg/S.gpg-agent.ssh /run/user/${user-id}/gnupg/S.gpg-agent.ssh
               '';
+          port-expr = if builtins.hasAttr name inputs.self.nixosConfigurations then "Port ${builtins.toString cfg.port}" else "";
         in
         ''
           Host ${name}
             Hostname ${name}.local
             User ${remote-user-name}
             ForwardAgent yes
-            Port ${builtins.toString cfg.port}
+            ${port-expr}
             ${forward-gpg}
         ''
       )