diff --git a/chezmoi.roots/_home.macos/private_dot_config/remove_starship.toml.old b/chezmoi.roots/_home.macos/private_dot_config/remove_starship.toml.old
new file mode 120000
index 0000000..a7e865c
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/remove_starship.toml.old
@@ -0,0 +1 @@
+../../_home/private_dot_config/remove_starship.toml.old
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh b/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh
deleted file mode 120000
index ab12b53..0000000
--- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh
+++ /dev/null
@@ -1 +0,0 @@
-../../../_home/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh b/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh
deleted file mode 120000
index 4ebe31a..0000000
--- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh
+++ /dev/null
@@ -1 +0,0 @@
-../../../_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh b/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh
new file mode 100644
index 0000000..05133cf
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh
@@ -0,0 +1,31 @@
+#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
+
+if [ -n "$ZI_HOME" ]; then
+    #zinit light 'marlonrichert/zsh-autocomplete'
+    zinit light 'zsh-users/zsh-completions'
+    zinit light 'zsh-users/zsh-autosuggestions'
+else
+    znap source 'zdharma-continuum/fast-syntax-highlighting'
+    #znap source 'marlonrichert/zsh-autocomplete'
+    znap source 'zsh-users/zsh-completions'
+    znap source 'zsh-users/zsh-autosuggestions'
+
+    # Make Tab and ShiftTab cycle completions on the command line
+    # bindkey              '^I'         menu-complete
+    # bindkey "$terminfo[kcbt]" reverse-menu-complete
+
+    # Make Tab and ShiftTab go to the menu
+                                bindkey              '^I' menu-select
+    [ -z "$terminfo[kcbt]" ] || bindkey "$terminfo[kcbt]" menu-select
+
+    # Make Tab and ShiftTab change the selection in the menu
+                                 bindkey -M menuselect              '^I'         menu-complete
+     [ -z "$terminfo[kcbt]" ] || bindkey -M menuselect "$terminfo[kcbt]" reverse-menu-complete
+
+    # Make ← and → always move the cursor on the command line
+    # bindkey -M menuselect  '^[[D' .backward-char  '^[OD' .backward-char
+    # bindkey -M menuselect  '^[[C'  .forward-char  '^[OC'  .forward-char
+fi
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
+
diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env b/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env
deleted file mode 120000
index e612aca..0000000
--- a/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env
+++ /dev/null
@@ -1 +0,0 @@
-../../../_home/private_dot_config/sz.env/091_load_complete-alias.env
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/television/vast_channels.toml b/chezmoi.roots/_home.macos/private_dot_config/television/vast_channels.toml
deleted file mode 120000
index 8edc39e..0000000
--- a/chezmoi.roots/_home.macos/private_dot_config/television/vast_channels.toml
+++ /dev/null
@@ -1 +0,0 @@
-../../../_home/private_dot_config/television/vast_channels.toml
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/television/vast_channels.toml b/chezmoi.roots/_home.macos/private_dot_config/television/vast_channels.toml
new file mode 100644
index 0000000..9e00e73
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/television/vast_channels.toml
@@ -0,0 +1,15 @@
+# S3
+[[cable_channel]]
+name = "vast-s3-releases"
+source_command = "vast-lab get s3-releases"
+preview_command = "aws s3 ls s3://vastdata-releases/release_bundles/service-packs/{0}/"
+
+[[cable_channel]]
+name = "vast-s3-callhome"
+source_command = "vast-lab get s3-callhome"
+preview_command = "aws s3 ls s3://vast-callhomebundle/{0}/"
+
+[[cable_channel]]
+name = "files"
+source_command = "fd -I -t f"
+preview_command = ":files:"
diff --git a/chezmoi.roots/_home.macos/private_dot_config/zellij/config.kdl.tmpl b/chezmoi.roots/_home.macos/private_dot_config/zellij/config.kdl.tmpl
new file mode 120000
index 0000000..0ee8ca0
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/zellij/config.kdl.tmpl
@@ -0,0 +1 @@
+../../../_home/private_dot_config/zellij/config.kdl.tmpl
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/RTP-IceLake.kdl b/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/RTP-IceLake.kdl
new file mode 120000
index 0000000..cb85285
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/RTP-IceLake.kdl
@@ -0,0 +1 @@
+../../../../_home/private_dot_config/zellij/layouts/RTP-IceLake.kdl
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/cs-dbg.kdl b/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/cs-dbg.kdl
deleted file mode 120000
index 4f27d5a..0000000
--- a/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/cs-dbg.kdl
+++ /dev/null
@@ -1 +0,0 @@
-../../../../_home/private_dot_config/zellij/layouts/cs-dbg.kdl
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_local/bin/symlink_zfs.tmpl b/chezmoi.roots/_home.macos/private_dot_local/bin/symlink_zfs.tmpl
new file mode 120000
index 0000000..87901b2
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_local/bin/symlink_zfs.tmpl
@@ -0,0 +1 @@
+../../../_home/private_dot_local/bin/symlink_zfs.tmpl
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_ssh/config.d/vast b/chezmoi.roots/_home.macos/private_dot_ssh/config.d/vast
index e3a7d98..66326c3 100644
--- a/chezmoi.roots/_home.macos/private_dot_ssh/config.d/vast
+++ b/chezmoi.roots/_home.macos/private_dot_ssh/config.d/vast
@@ -10,8 +10,8 @@ Host cs-dbg-tmp l3136
     User vastdata
     IdentityFile ~/.ssh/vast.id_rsa
 
-Host my-loop sales-devvm-gal-szkolnik-spot
-    User centos
-    HostName 10.91.1.10
+Host bonzo2 v60 10.27.200.60
+    User vastdata
+    IdentityFile ~/.ssh/vast.id_rsa
 
 # vim: set ft=sshconfig sw=4 sts=4 et:
diff --git a/chezmoi.roots/_home/dot_profile b/chezmoi.roots/_home/dot_profile
index 88fa551..c35c30c 100644
--- a/chezmoi.roots/_home/dot_profile
+++ b/chezmoi.roots/_home/dot_profile
@@ -8,6 +8,7 @@
 # for ssh logins, install and configure the libpam-umask package.
 #umask 022
 
+HOME="${HOME:-.}"
 # if running bash
 if [ -n "$BASH_VERSION" ]; then
     # include .bashrc if it exists
@@ -28,4 +29,4 @@ fi
 
 # Generated for envman. Do not edit.
 # [ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"
-[ -s "$HOME/.config/sz.env/_.load.sh" ] && . <( "$HOME/.config/sz.env/_.load.sh" - )
+
diff --git a/chezmoi.roots/_home/dot_zshrc b/chezmoi.roots/_home/dot_zshrc
index f01fa68..57b7cfe 100644
--- a/chezmoi.roots/_home/dot_zshrc
+++ b/chezmoi.roots/_home/dot_zshrc
@@ -1,3 +1,7 @@
+#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
+
+# ~/.zshrc: executed by zsh(1) for non-login shells.
+
 ## Generated for envman. Do not edit.
 #[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"
 #
diff --git a/chezmoi.roots/_home/private_dot_config/remove_starship.toml.old b/chezmoi.roots/_home/private_dot_config/remove_starship.toml.old
new file mode 120000
index 0000000..d3148ad
--- /dev/null
+++ b/chezmoi.roots/_home/private_dot_config/remove_starship.toml.old
@@ -0,0 +1 @@
+../../_src.all/private_dot_config/remove_starship.toml.old
\ No newline at end of file
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh
index 7e23504..895bd8d 100644
--- a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh
+++ b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_3_completion_system.env.zsh
@@ -4,7 +4,7 @@ if [ -n "$ZI_HOME" ]; then
     zinit light 'marlonrichert/zsh-autocomplete'
     zinit light 'zsh-users/zsh-autosuggestions'
 else
-    znap source 'marlonrichert/zsh-autocomplete'
+    #znap source 'marlonrichert/zsh-autocomplete'
     znap source 'zsh-users/zsh-autosuggestions'
 
     # Make Tab and ShiftTab cycle completions on the command line
@@ -12,12 +12,12 @@ else
     # bindkey "$terminfo[kcbt]" reverse-menu-complete
 
     # Make Tab and ShiftTab go to the menu
-    bindkey              '^I' menu-select
-    bindkey "$terminfo[kcbt]" menu-select
+                                bindkey              '^I' menu-select
+    [ -z "$terminfo[kcbt]" ] || bindkey "$terminfo[kcbt]" menu-select
 
     # Make Tab and ShiftTab change the selection in the menu
-    bindkey -M menuselect              '^I'         menu-complete
-    bindkey -M menuselect "$terminfo[kcbt]" reverse-menu-complete
+                                 bindkey -M menuselect              '^I'         menu-complete
+     [ -z "$terminfo[kcbt]" ] || bindkey -M menuselect "$terminfo[kcbt]" reverse-menu-complete
 
     # Make ← and → always move the cursor on the command line
     # bindkey -M menuselect  '^[[D' .backward-char  '^[OD' .backward-char
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/021_zellij.env b/chezmoi.roots/_home/private_dot_config/sz.env/021_zellij.env
index 6000c1c..4c18037 100644
--- a/chezmoi.roots/_home/private_dot_config/sz.env/021_zellij.env
+++ b/chezmoi.roots/_home/private_dot_config/sz.env/021_zellij.env
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
 
 if is_cmd load-zellij; then
-    [[ -z "$ZELLIJ_SESSION_NAME" && "${SZ_NOMUX:-0}" -eq '1' ]] \
+    [[ -z "$ZELLIJ_SESSION_NAME" && "${SZ_NOMUX:-0}" -eq '1' && "${ATUIN_DESKTOP_PTY}" = "true" ]] \
     && ZELLIJ_SESSION_NAME=__NO_LOAD__ 
     # zellij will need to allow reload of the enviornment
     [[ -z "$ZELLIJ_SESSION_NAME" ]] && unset SZ_ENV_LOADED
diff --git a/chezmoi.roots/_home/private_dot_config/zellij/layouts/cs-dbg.kdl b/chezmoi.roots/_home/private_dot_config/zellij/layouts/cs-dbg.kdl
deleted file mode 100644
index 82c481a..0000000
--- a/chezmoi.roots/_home/private_dot_config/zellij/layouts/cs-dbg.kdl
+++ /dev/null
@@ -1,16 +0,0 @@
-layout {
-    cwd "/Users/gal.szkolnik"
-    tab name="CS-DBG" hide_floating_panes=true {
-        pane size=1 borderless=true {
-            plugin location="zellij:tab-bar"
-        }
-        pane command="zsh" cwd="/Users/gal.szkolnik" size="55%" {
-            args "-ic" "ssh -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa cs-dbg"
-            start_suspended true
-        }
-        pane size=1 borderless=true {
-            plugin location="zellij:status-bar"
-        }
-    }
-}
-
diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_zfs.tmpl b/chezmoi.roots/_home/private_dot_local/bin/symlink_zfs.tmpl
index 01d053b..313bbeb 100644
--- a/chezmoi.roots/_home/private_dot_local/bin/symlink_zfs.tmpl
+++ b/chezmoi.roots/_home/private_dot_local/bin/symlink_zfs.tmpl
@@ -1 +1,3 @@
+{{- if stat "/sbin/zfs" -}}
 /sbin/zfs
+{{- end -}}