diff --git a/config.nix b/config.nix
index 939ca4585a621eb3dbfb90d06afeb753da82c85d..b511063af78835ccbaa8fdebbbf60f7d99cbc283 100644
--- a/config.nix
+++ b/config.nix
@@ -184,11 +184,20 @@       {
         name = "typst";
         auto-format = true;
 {pkgs ? import <nixpkgs> {}}: {
+        C-k = "expand_selection";
+        injection-regex = "typst";
+        file-types = ["typ"];
+        roots = [];
+        comment-token = "//";
+{pkgs ? import <nixpkgs> {}}: {
         ];
 {pkgs ? import <nixpkgs> {}}: {
+        "{" = ["goto_prev_paragraph" "collapse_selection"];
+{pkgs ? import <nixpkgs> {}}: {
       };
     ];
     language-server = {
+      typst.command = "${typst-lsp}/bin/typst-lsp";
       nil.config.nil.nix.flake.autoEvalInputs = true;
       gpt = {
         command = "${helix-gpt}";
@@ -215,5 +224,12 @@       "ui.background" = {};
     };
   };
   grammars = [
+    {
+      name = "typst";
+      url = "https://github.com/uben0/tree-sitter-typst";
+      rev = "791cac478226e3e78809b67ff856010bde709594";
+      sha256 = "sha256-YI+EyLKvw1qg122aH1UCggTQtDT8TioSau6GGRwWktc=";
+      queries = "queries";
+    }
   ];
 }
diff --git a/flake.lock b/flake.lock
index e99f60b50effc618148e65266818d73bbc835db1..11f4c9968bd29dba72145fa0af5f4dd884ce6e95 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,12 @@ {
   "nodes": {
     "nixpkgs": {
       "locked": {
+        "lastModified": 1708751719,
+  "nodes": {
         "lastModified": 1712192574,
-        "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f480f9d09e4b4cf87ee6151eba068197125714de",
+        "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
         "type": "github"
       },
       "original": {