diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_znap.env.zsh b/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_znap.env.zsh
new file mode 120000
index 0000000..e294ca3
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/011_zsh_2_znap.env.zsh
@@ -0,0 +1 @@
+../../../_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env.bash b/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env.bash
new file mode 120000
index 0000000..0331ace
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/091_load_complete-alias.env.bash
@@ -0,0 +1 @@
+../../../_home/private_dot_config/sz.env/091_load_complete-alias.env.bash
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh
new file mode 120000
index 0000000..7fcff3b
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh
@@ -0,0 +1 @@
+../../../_home/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_091_load_complete-alias.env b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_091_load_complete-alias.env
new file mode 120000
index 0000000..a32b799
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/sz.env/remove_091_load_complete-alias.env
@@ -0,0 +1 @@
+../../../_home/private_dot_config/sz.env/remove_091_load_complete-alias.env
\ 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 f5ebaaf..7e23504 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
@@ -24,7 +24,7 @@ else
     # bindkey -M menuselect  '^[[C'  .forward-char  '^[OC'  .forward-char
 
     # `znap install` adds new commands and completions.
-    znap install aureliojargas/clitest zsh-users/zsh-completions
+    znap install aureliojargas/clitest zsh-users/zsh-completions zdharma-continuum/fast-syntax-highlighting
 fi
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env.bash b/chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env.bash
new file mode 100644
index 0000000..3ca260c
--- /dev/null
+++ b/chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env.bash
@@ -0,0 +1,11 @@
+#!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
+
+if [ -f "$SZ_ENV_ROOT/lib/complete-alias" ]; then
+    source <(sed -Ee 's/\(\( "\$COMPAL_AUTO_UNMASK"/(( \${COMPAL_AUTO_UNMASK:-0}/g' "$SZ_ENV_ROOT/lib/complete-alias") --noattach
+fi
+
+if [[ -n "${DBG}" && -n "$( command -v _complete_alias )" ]]; then
+    echo "complete-alias will be loaded."
+fi
+
+# vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env b/chezmoi.roots/_home/private_dot_config/sz.env/remove_091_load_complete-alias.env
similarity index 100%
rename from chezmoi.roots/_home/private_dot_config/sz.env/091_load_complete-alias.env
rename to chezmoi.roots/_home/private_dot_config/sz.env/remove_091_load_complete-alias.env
diff --git a/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij b/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij
index 9df778a..11a94e2 100644
--- a/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij
+++ b/chezmoi.roots/_home/private_dot_local/bin/executable_load-zellij
@@ -105,7 +105,7 @@ ${SET_X-:} -x
     # Was needed when zsh would load
     # . <( zellij setup --generate-completion "$BASE_SHELL" | sed -ne '/^function/,$p' )
     if [[ -z "$ZELLIJ_SESSION_NAME" ]]; then
-        zellij attach -c $USER@$(hostname)
+        zellij
     fi
 
 elif [[ "$1" == '-' ]]; then
diff --git a/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl b/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl
index f280f47..a70557a 100644
--- a/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl
+++ b/chezmoi.roots/_home/private_dot_local/bin/symlink_nvim.tmpl
@@ -1 +1,5 @@
+{{- if stat (list (env "HOME") "/.local/bin/squashfs-root/usr/bin/nvim" | join "/") -}}
+squashfs-root/usr/bin/nvim
+{{- else -}}
 nvim.AppImage
+{{- end -}}