diff --git a/.gitmodules b/.gitmodules
index 385912a..8e267c6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -71,12 +71,6 @@
 	path = src/.local/share/nvim/site/pack/3pp/start/vim-ledger
 	url = https://github.com/ledger/vim-ledger.git
 
-# document typesetting
-# ftplugin/typst.vim
-[submodule "src/.local/share/nvim/site/pack/3pp/start/typst.vim"]
-	path = src/.local/share/nvim/site/pack/3pp/start/typst.vim
-	url = https://github.com/kaarmu/typst.vim.git
-
 # color theme
 # init.lua
 [submodule "src/.local/share/nvim/site/pack/3pp/start/nvim-noirbuddy"]
diff --git a/programs b/programs
index fed6430..284fc89 100644
--- a/programs
+++ b/programs
@@ -145,6 +145,7 @@ arc-gtk-theme
 lxappearance-gtk3
 radare2
 typst
+typst-lsp
 neovide
 
 # .local/bin/pyinstantref script
diff --git a/src/.config/nvim/ftplugin/typst.vim b/src/.config/nvim/ftplugin/typst.vim
index 36cffae..336776f 100644
--- a/src/.config/nvim/ftplugin/typst.vim
+++ b/src/.config/nvim/ftplugin/typst.vim
@@ -23,16 +23,6 @@ function GitRoot()
 	return fnamemodify(finddir('.git', ";"), ":h")
 endfunc
 
-" compile typst doc on write
-function TypstWatch()
-	vsp
-	vertical resize 20
-	exec 'terminal ' .. 'typst watch --root ' .. GitRoot() .. " " .. expand("%:")
-	exec "norm \<c-w>h"
-endfunc
-
-nnoremap <silent><leader>fc :call TypstWatch()<cr>
-
 nnoremap <silent><leader>fr :silent exec "!zathura --fork " . expand("%:p:r") . ".pdf &"<cr>
 
 let g:AutoPairs = {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '$':'$', "```" : "```", "`": "`"}
diff --git a/src/.config/nvim/lua/coding.lua b/src/.config/nvim/lua/coding.lua
index 4e11f01..bc672ba 100644
--- a/src/.config/nvim/lua/coding.lua
+++ b/src/.config/nvim/lua/coding.lua
@@ -55,6 +55,7 @@ require 'nvim-treesitter.configs'.setup {
 		"rust",
 		"query",
 		"typst",
+		"toml",
 	},
 	sync_install = false,
 	auto_install = false,
@@ -238,6 +239,12 @@ local servers = {
 			},
 		},
 	},
+	typst_lsp = {
+		settings = {
+			exportPdf = "onSave" -- alternatively onType / never
+		}
+	},
+	nushell = {},
 }
 for lsp, sv_settings in pairs(servers) do
 	-- defaults
diff --git a/src/.local/share/nvim/site/pack/3pp/start/typst.vim b/src/.local/share/nvim/site/pack/3pp/start/typst.vim
deleted file mode 160000
index d9a7650..0000000
--- a/src/.local/share/nvim/site/pack/3pp/start/typst.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d9a7650e76c85f8ba437e056d08dd43b01b8bfd6