diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 47411b9..acb4f76 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -239,6 +239,8 @@ in
           stylua
           sumneko-lua-language-server
           taplo
+          typst
+          typst-lsp
           yamlfmt
         ];
         plugins = with pkgs.vimPlugins; [
diff --git a/modules/programs/nvim/plugins/default.nix b/modules/programs/nvim/plugins/default.nix
index f11b9d1..a1dc84d 100644
--- a/modules/programs/nvim/plugins/default.nix
+++ b/modules/programs/nvim/plugins/default.nix
@@ -234,6 +234,10 @@ with builtins;
       cmd = [ "StartupTime" ];
       conf = readFile ./vim-startuptime.lua;
     }
+    {
+      plugin = typst-vim;
+      ft = [ "typst" "typ" ];
+    }
     {
       plugin = comment-nvim;
       event = [ "BufReadPost" "BufNewFile" ];
diff --git a/modules/programs/nvim/plugins/nvim-lspconfig.lua b/modules/programs/nvim/plugins/nvim-lspconfig.lua
index 75c3e5d..d844ca5 100644
--- a/modules/programs/nvim/plugins/nvim-lspconfig.lua
+++ b/modules/programs/nvim/plugins/nvim-lspconfig.lua
@@ -127,6 +127,7 @@ local servers = {
   "pylsp",
   "ruff_lsp",
   "rust_analyzer",
+  "typst_lsp",
 }
 for _, lsp in ipairs(servers) do
   lspconfig_setup(lsp, {})