diff --git a/nvim/ftplugin/elixir.lua b/nvim/ftplugin/elixir.lua
deleted file mode 100644
index fe6caae..0000000
--- a/nvim/ftplugin/elixir.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/nvim/ftplugin/go.lua b/nvim/ftplugin/go.lua
deleted file mode 100644
index fe6caae..0000000
--- a/nvim/ftplugin/go.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/nvim/ftplugin/html.lua b/nvim/ftplugin/html.lua
deleted file mode 100644
index fe6caae..0000000
--- a/nvim/ftplugin/html.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/nvim/ftplugin/php.lua b/nvim/ftplugin/php.lua
deleted file mode 100644
index fe6caae..0000000
--- a/nvim/ftplugin/php.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/nvim/ftplugin/svelte.lua b/nvim/ftplugin/svelte.lua
deleted file mode 100644
index fe6caae..0000000
--- a/nvim/ftplugin/svelte.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.treesitter.start()
diff --git a/nvim/init.lua b/nvim/init.lua
index 77908c8..43ebf8d 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -106,3 +106,24 @@ vim.api.nvim_create_user_command("FormatEnable", function()
 end, {
     desc = "Re-enable autoformat-on-save",
 })
+
+-- Enable treesitter
+
+local fts = {
+    "php",
+    "javascript",
+    "typescript",
+    "lua",
+    "go",
+    "elixir",
+    "heex",
+}
+
+vim.api.nvim_create_autocmd('FileType', {
+    pattern = fts,
+    callback = function()
+        vim.treesitter.start()
+        vim.wo.foldexpr = 'v:lua.vim.treesitter.foldexpr()'
+        vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
+    end,
+})