diff --git a/kittens/ssh/main.py b/kittens/ssh/main.py index c20da1ef4..9fc8aeacc 100644 --- a/kittens/ssh/main.py +++ b/kittens/ssh/main.py @@ -78,7 +78,7 @@ def make_tarfile(ssh_opts: SSHOptions, base_env: Dict[str, str]) -> bytes: return filter from kitty.shell_integration import get_effective_ksi_env_var - if ssh_opts.shell_integration == 'inherit': + if ssh_opts.shell_integration == 'inherited': ksi = get_effective_ksi_env_var() else: from kitty.options.types import Options diff --git a/kittens/ssh/options/definition.py b/kittens/ssh/options/definition.py index 9efb5e94b..69b50650a 100644 --- a/kittens/ssh/options/definition.py +++ b/kittens/ssh/options/definition.py @@ -85,9 +85,9 @@ are installed. The location is relative to the HOME directory. Absolute paths or that resolve to a location outside the HOME are not allowed. ''') -opt('shell_integration', 'inherit', long_text=''' +opt('shell_integration', 'inherited', long_text=''' Control the shell integration on the remote host. See :ref:`shell_integration` -for details on how this setting works. The special value :code:`inherit` means +for details on how this setting works. The special value :code:`inherited` means use the setting from kitty.conf. This setting is useful for overriding integration on a per-host basis.''') diff --git a/kittens/ssh/options/types.py b/kittens/ssh/options/types.py index 5c9dd6998..a8c8320ff 100644 --- a/kittens/ssh/options/types.py +++ b/kittens/ssh/options/types.py @@ -19,7 +19,7 @@ class Options: interpreter: str = 'sh' login_shell: str = '' remote_dir: str = '.local/share/kitty-ssh-kitten' - shell_integration: str = 'inherit' + shell_integration: str = 'inherited' copy: typing.Dict[str, kittens.ssh.copy.CopyInstruction] = {} env: typing.Dict[str, str] = {} config_paths: typing.Tuple[str, ...] = ()