support ssh-arg in config file

Author: mikew

src/client/main.go

@@ -98,9 +98,9 @@ var CliClientOpenCommand = cli.Command{
 		},
 
 		&cli.StringSliceFlag{
-			Name:    "ssh-arg",
-			Usage:   "Additional arguments to pass to the SSH command",
-			Sources: cli.EnvVars("NVRH_CLIENT_SSH_ARG"),
+			Name:  "ssh-arg",
+			Usage: "Additional arguments to pass to the SSH command [$NVRH_CLIENT_SSH_ARG]",
+			// Sources: cli.EnvVars("NVRH_CLIENT_SSH_ARG"),
 		},
 
 		&cli.BoolFlag{
@@ -407,9 +407,9 @@ var CliClientReconnectCommand = cli.Command{
 		},
 
 		&cli.StringSliceFlag{
-			Name:    "ssh-arg",
-			Usage:   "Additional arguments to pass to the SSH command",
-			Sources: cli.EnvVars("NVRH_CLIENT_SSH_ARG"),
+			Name:  "ssh-arg",
+			Usage: "Additional arguments to pass to the SSH command [$NVRH_CLIENT_SSH_ARG]",
+			// Sources: cli.EnvVars("NVRH_CLIENT_SSH_ARG"),
 		},
 	},
 

src/nvrh_config/main.go

@@ -11,8 +11,9 @@ import (
 )
 
 type NvrhConfigServer struct {
-	NvimCmd  []string `yaml:"nvim-cmd"`
+	NvimCmd  []string `yaml:"nvim-cmd,omitempty"`
 	UsePorts *bool    `yaml:"use-ports,omitempty"`
+	SshArg   []string `yaml:"ssh-arg,omitempty"`
 }
 
 type NvrhConfig struct {
@@ -50,6 +51,7 @@ func LoadConfig(path string) (*NvrhConfig, error) {
 var envIndex = map[string][]string{
 	"nvim-cmd":  {"NVRH_CLIENT_NVIM_CMD"},
 	"use-ports": {"NVRH_CLIENT_USE_PORTS"},
+	"ssh-arg":   {"NVRH_CLIENT_SSH_ARG"},
 }
 
 func ApplyPrecedence(c *cli.Command, sc NvrhConfigServer) error {
@@ -68,6 +70,14 @@ func ApplyPrecedence(c *cli.Command, sc NvrhConfigServer) error {
 		}
 	}
 
+	if !c.IsSet("ssh-arg") && len(sc.SshArg) > 0 {
+		for _, v := range sc.SshArg {
+			if err := c.Set("ssh-arg", v); err != nil {
+				return err
+			}
+		}
+	}
+
 	// Fall back to environment variables if still not set.
 	for name, keys := range envIndex {
 		if c.IsSet(name) {