diff --git a/lua/config/treesitter.lua b/lua/config/treesitter.lua
index fc4f850..8aab8ff 100644
--- a/lua/config/treesitter.lua
+++ b/lua/config/treesitter.lua
@@ -1,8 +1,13 @@
-require("nvim-treesitter.config").setup {
-    ensure_installed = "all",
-    sync_install = true,
-    auto_install = true,
-    highlight = { enable = true, additional_vim_regex_highlighting = false },
-    indent = { enable = true, disable = {} },
-    autotag = { enable = true },
-}
+local treesitter = require "nvim-treesitter"
+
+treesitter.install { "all" }
+
+local parsers = treesitter.get_installed()
+
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = parsers,
+    callback = function()
+        vim.treesitter.start()
+        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+    end,
+})
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index aa4967b..24d4f6f 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -66,6 +66,9 @@ return {
     },
     {
         "nvim-treesitter/nvim-treesitter",
+        lazy = false,
+        branch = "main",
+        build = ":TSUpdate",
         config = function()
             require "config.treesitter"
         end,