Merge pull request #35 from erikarvstedt/fix-ssh-port1.26.2

target: use default port from SSH config

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/default.nix b/lib/default.nix
index 357f5b5..3bbd754 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -57,9 +57,9 @@ let {
       elemAt' = xs: i: if lib.length xs > i then lib.elemAt xs i else null;
       filterNull = lib.filterAttrs (n: v: v != null);
     in {
-      user = lib.getEnv "LOGNAME";
+      user = lib.maybeEnv "LOGNAME" null;
       host = lib.maybeEnv "HOSTNAME" (lib.maybeHostName "localhost");
-      port = "22";
+      port = null;
       path = "/var/src";
       sudo = false;
       extraOptions = [];
@@ -70,6 +70,10 @@ let {
       path = elemAt' parse 6;
     } else s);
 
+    mkUserPortSSHOpts = target:
+      (lib.optionals (target.user != null) ["-l" target.user]) ++
+      (lib.optionals (target.port != null) ["-p" target.port]);
+
     shell = let
       isSafeChar = lib.testString "[-+./0-9:=A-Z_a-z]";
       quoteChar = c: