diff --git a/tools/nvim/lua/plugins/lang/init.lua b/tools/nvim/lua/plugins/lang/init.lua
index 5d390eb..08be240 100644
--- a/tools/nvim/lua/plugins/lang/init.lua
+++ b/tools/nvim/lua/plugins/lang/init.lua
@@ -6,6 +6,7 @@ return {
   { import = "plugins.lang.beancount" },
   { import = "plugins.lang.tex" },
   { import = "plugins.lang.lua" },
+  { import = "plugins.lang.treesitter" },
   { import = "plugins.mod.trouble-nvim" },
   {
     "williamboman/mason.nvim",
@@ -29,22 +30,4 @@ return {
   --   },
   -- },
   { import = "plugins.mod.conform-nvim" },
-  { "nvim-treesitter/nvim-treesitter-context", lazy = true },
-  {
-    "nvim-treesitter/nvim-treesitter",
-    run = ":TSUpdate",
-    cmd = {
-      "TSInstall",
-      "TSUpdate",
-      "TSUpdateSync",
-    },
-    event = {
-      "VeryLazy",
-    },
-    opts = {
-      ensure_installed = { "c", "lua", "vim", "vimdoc", "markdown", "markdown_inline" },
-      highlight = { enable = true },
-      indent = { enable = true },
-    },
-  },
 }
diff --git a/tools/nvim/lua/plugins/lang/treesitter.lua b/tools/nvim/lua/plugins/lang/treesitter.lua
new file mode 100644
index 0000000..c778722
--- /dev/null
+++ b/tools/nvim/lua/plugins/lang/treesitter.lua
@@ -0,0 +1,20 @@
+return {
+  { "nvim-treesitter/nvim-treesitter-context", lazy = true },
+  {
+    "nvim-treesitter/nvim-treesitter",
+    run = ":TSUpdate",
+    cmd = {
+      "TSInstall",
+      "TSUpdate",
+      "TSUpdateSync",
+    },
+    event = {
+      "BufReadPre",
+    },
+    opts = {
+      ensure_installed = { "c", "lua", "vim", "vimdoc", "markdown", "markdown_inline" },
+      highlight = { enable = true },
+      indent = { enable = true },
+    },
+  },
+}