From 1633cf27325e87d731a0d8ed5df8e4488c29d0bd Mon Sep 17 00:00:00 2001 From: "Lockszmith (@crater)" Date: Wed, 12 Mar 2025 17:59:18 +0000 Subject: [PATCH] Add SZ_NOMUX identification --- _home/private_dot_config/sz.env/aaa_000_term.env | 1 + _src.posix/private_dot_config/sz.env/aaa_000_term.env | 8 ++++++++ _src.posix/private_dot_config/sz.env/aab_zellij.env | 6 +++++- 3 files changed, 14 insertions(+), 1 deletion(-) create mode 120000 _home/private_dot_config/sz.env/aaa_000_term.env create mode 100644 _src.posix/private_dot_config/sz.env/aaa_000_term.env diff --git a/_home/private_dot_config/sz.env/aaa_000_term.env b/_home/private_dot_config/sz.env/aaa_000_term.env new file mode 120000 index 0000000..fdfda3f --- /dev/null +++ b/_home/private_dot_config/sz.env/aaa_000_term.env @@ -0,0 +1 @@ +../../../_src.posix/private_dot_config/sz.env/aaa_000_term.env \ No newline at end of file diff --git a/_src.posix/private_dot_config/sz.env/aaa_000_term.env b/_src.posix/private_dot_config/sz.env/aaa_000_term.env new file mode 100644 index 0000000..7f4ab9b --- /dev/null +++ b/_src.posix/private_dot_config/sz.env/aaa_000_term.env @@ -0,0 +1,8 @@ +#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"' + +BASE_SHELL=${BASE_SHELL:-${SHELL##*/}} + +SZ_NOMUX=0 + +[ $SZ_NOMUX -eq 1 ] || [ "$TERM_PROGRAM" != 'vscode' ] || SZ_NOMUX=1 +[ $SZ_NOMUX -eq 1 ] || [ -n "${VSCODE_PROFILE_INITIALIZED}" ] || SZ_NOMUX=1 diff --git a/_src.posix/private_dot_config/sz.env/aab_zellij.env b/_src.posix/private_dot_config/sz.env/aab_zellij.env index d3999ff..dc326a6 100644 --- a/_src.posix/private_dot_config/sz.env/aab_zellij.env +++ b/_src.posix/private_dot_config/sz.env/aab_zellij.env @@ -1,8 +1,12 @@ #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"' -if is_cmd load-zellij && [ -z "${VSCODE_PROFILE_INITIALIZED}" ]; then +if is_cmd load-zellij; then + [[ -z "$ZELLIJ_SESSION_NAME" && "${SZ_NOMUX:-0}" -eq '1' ]] \ + && ZELLIJ_SESSION_NAME=__NO_LOAD__ # zellij will need to allow reload of the enviornment [[ -z "$ZELLIJ_SESSION_NAME" ]] && unset SZ_ENV_LOADED . <( load-zellij - ) [[ -z "$ZELLIJ_SESSION_NAME" ]] && SZ_ENV_LOADED=1 + + [[ "$ZELLIJ_SESSION_NAME" == '__NO_LOAD__' ]] && unset ZELLIJ_SESSION_NAME fi