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 100644
index 82c481a..0000000
--- a/chezmoi.roots/_home.macos/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.macos/private_dot_config/zellij/layouts/cs-dbg.kdl b/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/cs-dbg.kdl
new file mode 120000
index 0000000..4f27d5a
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/cs-dbg.kdl
@@ -0,0 +1 @@
+../../../../_home/private_dot_config/zellij/layouts/cs-dbg.kdl
\ No newline at end of file
diff --git a/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/teleport.kdl b/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/teleport.kdl
deleted file mode 100644
index c3c678e..0000000
--- a/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/teleport.kdl
+++ /dev/null
@@ -1,16 +0,0 @@
-layout {
-    cwd "/Users/gal.szkolnik"
-    tab name="Teleport" 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" "vast-teleport launch --from-zellij"
-            start_suspended true
-        }
-        pane size=1 borderless=true {
-            plugin location="zellij:status-bar"
-        }
-    }
-}
-
diff --git a/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/teleport.kdl b/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/teleport.kdl
new file mode 120000
index 0000000..2774f52
--- /dev/null
+++ b/chezmoi.roots/_home.macos/private_dot_config/zellij/layouts/teleport.kdl
@@ -0,0 +1 @@
+../../../../_home/private_dot_config/zellij/layouts/teleport.kdl
\ 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 4385c0d..e3a7d98 100644
--- a/chezmoi.roots/_home.macos/private_dot_ssh/config.d/vast
+++ b/chezmoi.roots/_home.macos/private_dot_ssh/config.d/vast
@@ -5,6 +5,11 @@
 Host crater-kfs2
     HostName crater-kfs2
 
+Host cs-dbg-tmp l3136
+    HostName l3136
+    User vastdata
+    IdentityFile ~/.ssh/vast.id_rsa
+
 Host my-loop sales-devvm-gal-szkolnik-spot
     User centos
     HostName 10.91.1.10
diff --git a/chezmoi.roots/_home/.chezmoiignore b/chezmoi.roots/_home/.chezmoiignore
index a057fd1..8fb6fc5 100644
--- a/chezmoi.roots/_home/.chezmoiignore
+++ b/chezmoi.roots/_home/.chezmoiignore
@@ -2,4 +2,7 @@
 /**/.git/**
 
 .config/vim/autoload
+.config/raycast/node_modules
+!.config/raycast/extensions/*/package.json
+.config/raycast/extensions/*/*/**
 
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh
new file mode 100644
index 0000000..9dce82c
--- /dev/null
+++ b/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_znap.env.zsh
@@ -0,0 +1,10 @@
+#!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
+
+ZNAP_REPO="${XDG_DATA_HOME:-${HOME}/.local/share}/znap/_"
+
+# Download Znap, if it's not there yet.
+[[ -r "${ZNAP_REPO}/znap.zsh" ]] ||
+    git clone --depth 1 -- \
+        https://github.com/marlonrichert/zsh-snap.git "${ZNAP_REPO}"
+source "${ZNAP_REPO}/znap.zsh"  # Start Znap
+
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 ad813b0..f5ebaaf 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
@@ -1,7 +1,31 @@
 #!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
 
-zinit light 'marlonrichert/zsh-autocomplete'
-zinit light 'zsh-users/zsh-autosuggestions'
+if [ -n "$ZI_HOME" ]; then
+    zinit light 'marlonrichert/zsh-autocomplete'
+    zinit light 'zsh-users/zsh-autosuggestions'
+else
+    znap source 'marlonrichert/zsh-autocomplete'
+    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
+    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
+
+    # 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
+
+    # `znap install` adds new commands and completions.
+    znap install aureliojargas/clitest zsh-users/zsh-completions
+fi
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
 
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh
index 54063bb..2cbca19 100644
--- a/chezmoi.roots/_home/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh
+++ b/chezmoi.roots/_home/private_dot_config/sz.env/031_zsh_4_plugin_vimode.env.zsh
@@ -1,7 +1,11 @@
 #!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
 
-zinit ice depth=1
-zinit light jeffreytse/zsh-vi-mode
+if [ -n "$ZI_HOME" ]; then
+    zinit ice depth=1
+    zinit light jeffreytse/zsh-vi-mode
+else
+    znap source jeffreytse/zsh-vi-mode
+fi
 
 [[ -n "${DBG}" ]] && echo "jeffreytse/zsh-vi-mode loaded"
 
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh
index b003016..a075587 100644
--- a/chezmoi.roots/_home/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh
+++ b/chezmoi.roots/_home/private_dot_config/sz.env/091_zsh_9_zinit_fin.env.zsh
@@ -1,10 +1,12 @@
 #!/usr/bin/env -S zsh -c 'echo "Not a user script. source(aka .) only"'
 
-autoload -Uz _zi
-(( ${+_comps} )) && _comps[zi]=_zi
+if [ -n "$ZI_HOME" ]; then
+    autoload -Uz _zi
+    (( ${+_comps} )) && _comps[zi]=_zi
 
-autoload -Uz +X compinit bashcompinit && compinit && bashcompinit
-[[ -n "${DBG}" ]] && echo "zinit/zi loaded available"
+    autoload -Uz +X compinit bashcompinit && compinit && bashcompinit
+    [[ -n "${DBG}" ]] && echo "zinit/zi loaded available"
+fi
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
 
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/981_atuin.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/981_atuin.env.zsh
index 9d06c88..432cae0 100644
--- a/chezmoi.roots/_home/private_dot_config/sz.env/981_atuin.env.zsh
+++ b/chezmoi.roots/_home/private_dot_config/sz.env/981_atuin.env.zsh
@@ -2,8 +2,12 @@
 
 if is_cmd atuin; then
 
-    # . <( atuin init "${BASE_SHELL}" )
-    zinit light atuinsh/atuin
+    if [ -n "$ZI_HOME" ]; then
+        # . <( atuin init "${BASE_SHELL}" )
+        zinit light atuinsh/atuin
+    else
+        znap source atuinsh/atuin
+    fi
 
     [[ -n "${DBG}" ]] && echo "atuin loaded."
 fi
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/991_zsh_finalize.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/991_zsh_finalize.env.zsh
index 1d7c69e..6d40535 100644
--- a/chezmoi.roots/_home/private_dot_config/sz.env/991_zsh_finalize.env.zsh
+++ b/chezmoi.roots/_home/private_dot_config/sz.env/991_zsh_finalize.env.zsh
@@ -1,6 +1,8 @@
 #!/usr/bin/env -S bash -c 'echo "Not a user script. source(aka .) only"'
 
-zicompinit
+if [ -n "$ZI_HOME" ]; then
+    zicompinit
+fi
 
 # vim: set ft=sh expandtab tabstop=4 shiftwidth=4:
 
diff --git a/chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh b/chezmoi.roots/_home/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh
similarity index 100%
rename from chezmoi.roots/_home/private_dot_config/sz.env/011_zsh_2_zinit.env.zsh
rename to chezmoi.roots/_home/private_dot_config/sz.env/remove_011_zsh_2_zinit.env.zsh
diff --git a/chezmoi.roots/_src.all/private_dot_config/wezterm/wezterm.lua.tmpl b/chezmoi.roots/_src.all/private_dot_config/wezterm/wezterm.lua.tmpl
index 4a26c95..01f1a2d 100644
--- a/chezmoi.roots/_src.all/private_dot_config/wezterm/wezterm.lua.tmpl
+++ b/chezmoi.roots/_src.all/private_dot_config/wezterm/wezterm.lua.tmpl
@@ -284,10 +284,14 @@ config.keys = {
 --	{ key = 'Q',              mods = 'SHIFT|CTRL',     action = act.QuitApplication },
 --	{ key = 'R',              mods = 'CTRL',           action = act.ReloadConfiguration },
 --	{ key = 'R',              mods = 'SHIFT|CTRL',     action = act.ReloadConfiguration },
-	{ key = 'T',              mods = 'CTRL',           action = act.ShowLauncher },
-	{ key = 't',              mods = 'CTRL',           action = act.ShowLauncher },
-	{ key = 't',              mods = 'SUPER',          action = act.ShowLauncher },
-	{ key = 'T',              mods = 'SUPER',          action = act.ShowLauncher },
+--	{ key = 'T',              mods = 'CTRL',           action = act.ShowLauncher },
+--	{ key = 't',              mods = 'CTRL',           action = act.ShowLauncher },
+	{ key = 'T',              mods = 'SHIFT|CTRL',     action = act.ShowLauncher },
+	{ key = 't',              mods = 'SHIFT|CTRL',     action = act.ShowLauncher },
+--	{ key = 't',              mods = 'SUPER',          action = act.ShowLauncher },
+--	{ key = 'T',              mods = 'SUPER',          action = act.ShowLauncher },
+	{ key = 't',              mods = 'SHIFT|SUPER',    action = act.ShowLauncher },
+	{ key = 'T',              mods = 'SHIFT|SUPER',    action = act.ShowLauncher },
 	{ key = 'U',              mods = 'CTRL',           action = act.CharSelect{ copy_on_select = true, copy_to =  'ClipboardAndPrimarySelection' } },
 	{ key = 'U',              mods = 'SHIFT|CTRL',     action = act.CharSelect{ copy_on_select = true, copy_to =  'ClipboardAndPrimarySelection' } },
 	{ key = 'V',              mods = 'CTRL',           action = act.PasteFrom 'Clipboard' },
@@ -355,6 +359,10 @@ config.keys = {
 	{ key = 'PageUp',         mods = 'SUPER',          action = act.ActivateTabRelative(-1) },
 	{ key = 'PageDown',       mods = 'SUPER',          action = act.ActivateTabRelative(1) },
 
+    { key = 'd',              mods = 'SUPER',          action = wezterm.action.SendKey { key = 'd', mods = 'CTRL' } },
+    { key = 'c',              mods = 'SUPER',          action = wezterm.action.SendKey { key = 'c', mods = 'CTRL' } },
+    { key = 'r',              mods = 'SUPER',          action = wezterm.action.SendKey { key = 'r', mods = 'CTRL' } },
+
 }
   
 config.key_tables = {