diff --git a/config.nix b/config.nix
index 9de08109054709d0704c4ef6f5841db422f90dce..4b190c9c4a15719749d6964988c92ff08d3a3c2f 100644
--- a/config.nix
+++ b/config.nix
@@ -198,6 +198,18 @@           args = ["fmt"];
         };
       }
 {pkgs ? import <nixpkgs> {}}: {
+      color-modes = true;
+        name = "typst";
+        auto-format = true;
+        scope = "source.typst";
+        injection-regex = "typst";
+        file-types = ["typ"];
+        roots = [];
+        comment-token = "//";
+        language-server.command = "${typst-lsp}/bin/typst-lsp";
+        formatter.command = "${typst-fmt}/bin/typstfmt";
+      }
+{pkgs ? import <nixpkgs> {}}: {
         C-c = ":config-open";
   };
   themes = {
@@ -225,6 +237,13 @@       url = "https://github.com/vrischmann/tree-sitter-templ";
       rev = "9f63037ad08a58050d0582ef1ae0009bd0fbf2f1";
       sha256 = "sha256-AGZm2D8rW08gMyZ8dSZyAgqgyl/lKiZxBOFDPX0LY4I=";
       queries = "queries/templ";
+    }
+    {
+      name = "typst";
+      url = "https://github.com/uben0/tree-sitter-typst";
+      rev = "791cac478226e3e78809b67ff856010bde709594";
+      sha256 = "sha256-YI+EyLKvw1qg122aH1UCggTQtDT8TioSau6GGRwWktc=";
+      queries = "queries";
     }
   ];
 }

diff --git a/flake.nix b/flake.nix
index 84723eb865d141df8ac58a6cee71a64d7e2f3e73..ffc8a65f525b487ef5bf45621f083f6b76f9648a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,6 +23,7 @@         pname = "helix-tree-sitter-grammar-${grammar.name}";
         version = grammar.rev;
         buildInputs = [pkgs.helix pkgs.git];
         src = source;
+        dontInstall = true;
         buildPhase = ''
           runHook preBuild