diff --git a/home/programs/nvim.nix b/home/programs/nvim.nix
index a866a0d..3da273a 100644
--- a/home/programs/nvim.nix
+++ b/home/programs/nvim.nix
@@ -88,11 +88,14 @@ in
         },
       })
 
-      -- Indent is left off deliberately: treesitter's Java indent fights the
-      -- Eclipse-matching tab settings applied in the FileType autocmd below.
-      require("nvim-treesitter.configs").setup({
-        highlight = { enable = true },
-        indent = { enable = false },
+      -- nvim-treesitter no longer exposes a configs module; highlighting is
+      -- started per buffer. Indent is deliberately left alone so treesitter
+      -- doesn't fight the Eclipse-matching tab settings below.
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = { "java", "xml", "nix", "lua" },
+        callback = function(args)
+          pcall(vim.treesitter.start, args.buf)
+        end,
       })
 
       -- Java indentation must match Eclipse's formatter, not the 2-space default.