diff --git a/.config/helix/runtime/queries/vim/folds.scm b/.config/helix/runtime/queries/vim/folds.scm
new file mode 100644
index 00000000..0a1fb695
--- /dev/null
+++ b/.config/helix/runtime/queries/vim/folds.scm
@@ -0,0 +1,4 @@
+[
+  (if_statement)
+  (function_definition)
+] @fold
diff --git a/.config/helix/runtime/queries/vim/injections.scm b/.config/helix/runtime/queries/vim/injections.scm
new file mode 100644
index 00000000..30d11cbb
--- /dev/null
+++ b/.config/helix/runtime/queries/vim/injections.scm
@@ -0,0 +1,44 @@
+(lua_statement
+  (script
+    (body) @injection.content
+    (#set! injection.language "lua")))
+
+(lua_statement
+  (chunk) @injection.content
+  (#set! injection.language "lua"))
+
+(ruby_statement
+  (script
+    (body) @injection.content
+    (#set! injection.language "ruby")))
+
+(ruby_statement
+  (chunk) @injection.content
+  (#set! injection.language "ruby"))
+
+(python_statement
+  (script
+    (body) @injection.content
+    (#set! injection.language "python")))
+
+(python_statement
+  (chunk) @injection.content
+  (#set! injection.language "python"))
+
+; If we support perl at some point...
+; (perl_statement (script (body) @perl))
+; (perl_statement (chunk) @perl)
+(autocmd_statement
+  (pattern) @injection.content
+  (#set! injection.language "regex"))
+
+((set_item
+  option: (option_name) @_option
+  value: (set_value) @injection.content)
+  (#any-of? @_option
+    "includeexpr" "inex" "printexpr" "pexpr" "formatexpr" "fex" "indentexpr" "inde" "foldtext" "fdt"
+    "foldexpr" "fde" "diffexpr" "dex" "patchexpr" "pex" "charconvert" "ccv")
+  (#set! injection.language "vim"))
+
+((comment) @injection.content
+  (#set! injection.language "comment"))
diff --git a/.zshrc b/.zshrc
index c5042323..7e35b351 100644
--- a/.zshrc
+++ b/.zshrc
@@ -64,12 +64,12 @@ alias catkeys='/bin/cat -v'
 alias e="$EDITOR"
 alias edit="$EDITOR"
 alias h="$HELIX"
-alias v='nvim'
-alias vim='nvim'
-alias vi='nvim'
+# alias v='nvim'
+# alias vim='nvim'
+# alias vi='nvim'
 alias vm='nvim --clean'
 alias mktdir='cd $(mktemp -d)'
-alias n='nvim'
+# alias n='nvim'
 alias lg=lazygit
 alias ylg="yadm enter lazygit"
 # tmux aliases