From c30160a2caaa578c0fd14657a0b1a560c6005f4a Mon Sep 17 00:00:00 2001
From: "Lockszmith (@VAST)" <gal.szkolnik@vastdata.com>
Date: Wed, 12 Mar 2025 17:32:42 -0400
Subject: [PATCH 1/2] Fix SZ_NOMUX detection

---
 _home.macos/private_dot_config/sz.env/aaa_000_term.env |  1 +
 _src.posix/private_dot_config/sz.env/aaa_000_term.env  | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 120000 _home.macos/private_dot_config/sz.env/aaa_000_term.env

diff --git a/_home.macos/private_dot_config/sz.env/aaa_000_term.env b/_home.macos/private_dot_config/sz.env/aaa_000_term.env
new file mode 120000
index 0000000..fdfda3f
--- /dev/null
+++ b/_home.macos/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
index 7f4ab9b..2ad9ef1 100644
--- a/_src.posix/private_dot_config/sz.env/aaa_000_term.env
+++ b/_src.posix/private_dot_config/sz.env/aaa_000_term.env
@@ -2,7 +2,11 @@
 
 BASE_SHELL=${BASE_SHELL:-${SHELL##*/}}
 
-SZ_NOMUX=0
+SZ_NOMUX=${SZ_NOMUX:-0}
 
-[ $SZ_NOMUX -eq 1 ] || [ "$TERM_PROGRAM" != 'vscode' ] || SZ_NOMUX=1
-[ $SZ_NOMUX -eq 1 ] || [ -n "${VSCODE_PROFILE_INITIALIZED}" ] || SZ_NOMUX=1
+if [ "${SZ_NOMUX:-0}" -ne 1 ]; then 
+       [ "$TERM_PROGRAM" != 'vscode' ] \
+    && [ "$TERM_PROGRAM" != 'Tabby' ] \
+    && [ -z "${VSCODE_PROFILE_INITIALIZED}" ] \
+    || SZ_NOMUX=1
+fi

From 7b07ef0a4c702dceca2bce5253fca6746e7c1d4e Mon Sep 17 00:00:00 2001
From: "Lockszmith (@VAST)" <gal.szkolnik@vastdata.com>
Date: Wed, 12 Mar 2025 17:33:09 -0400
Subject: [PATCH 2/2] Remove vim symlinks, now that aliases are doing the work
 properly

---
 _home.macos/private_dot_local/bin/remove_nvim               | 0
 _home.macos/private_dot_local/bin/remove_szetup-kubectl4k3s | 0
 _home.macos/private_dot_local/bin/remove_update-nvim        | 0
 _home.macos/private_dot_local/bin/remove_vi                 | 0
 _home.macos/private_dot_local/bin/remove_vim                | 0
 _home.macos/private_dot_local/bin/remove_vim.tiny           | 0
 _home.macos/private_dot_local/bin/remove_vimdiff            | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 _home.macos/private_dot_local/bin/remove_nvim
 create mode 100644 _home.macos/private_dot_local/bin/remove_szetup-kubectl4k3s
 create mode 100644 _home.macos/private_dot_local/bin/remove_update-nvim
 create mode 100644 _home.macos/private_dot_local/bin/remove_vi
 create mode 100644 _home.macos/private_dot_local/bin/remove_vim
 create mode 100644 _home.macos/private_dot_local/bin/remove_vim.tiny
 create mode 100644 _home.macos/private_dot_local/bin/remove_vimdiff

diff --git a/_home.macos/private_dot_local/bin/remove_nvim b/_home.macos/private_dot_local/bin/remove_nvim
new file mode 100644
index 0000000..e69de29
diff --git a/_home.macos/private_dot_local/bin/remove_szetup-kubectl4k3s b/_home.macos/private_dot_local/bin/remove_szetup-kubectl4k3s
new file mode 100644
index 0000000..e69de29
diff --git a/_home.macos/private_dot_local/bin/remove_update-nvim b/_home.macos/private_dot_local/bin/remove_update-nvim
new file mode 100644
index 0000000..e69de29
diff --git a/_home.macos/private_dot_local/bin/remove_vi b/_home.macos/private_dot_local/bin/remove_vi
new file mode 100644
index 0000000..e69de29
diff --git a/_home.macos/private_dot_local/bin/remove_vim b/_home.macos/private_dot_local/bin/remove_vim
new file mode 100644
index 0000000..e69de29
diff --git a/_home.macos/private_dot_local/bin/remove_vim.tiny b/_home.macos/private_dot_local/bin/remove_vim.tiny
new file mode 100644
index 0000000..e69de29
diff --git a/_home.macos/private_dot_local/bin/remove_vimdiff b/_home.macos/private_dot_local/bin/remove_vimdiff
new file mode 100644
index 0000000..e69de29