treesitter: add setupOpts

For covering missing options for master, and for main branch just in
case someone wants to change the install dir

Author: HeitorAugustoLN

docs/manual/release-notes/rl-0.9.md

@@ -39,4 +39,5 @@
 
 [jtliang24](https://github.com/jtliang24):
 
-- Updated nix language plugin to use pkgs.nixfmt instead of pkgs.nixfmt-rfc-style
+- Updated nix language plugin to use pkgs.nixfmt instead of
+  pkgs.nixfmt-rfc-style

modules/plugins/treesitter/config.nix

@@ -28,28 +28,31 @@ in {
 
         if has_configs_module then
           -- nvim-treesitter master branch
-          require('nvim-treesitter.configs').setup({
+          require('nvim-treesitter.configs').setup(vim.tbl_deep_extend("force", {
             ${lib.optionalString cfg.highlight.enable ''
-              highlight = { enable = true },
-            ''}${lib.optionalString cfg.indent.enable ''
-              indent = { enable = true },
-            ''}
-          })
+          highlight = { enable = true },
+        ''}${lib.optionalString cfg.indent.enable ''
+          indent = { enable = true },
+        ''}
+          }, ${lib.nvim.lua.toLuaObject cfg.setupOpts}))
         else
           -- nvim-treesitter main branch
+          ${lib.optionalString (cfg.setupOpts != {}) ''
+          require('nvim-treesitter').setup(${lib.nvim.lua.toLuaObject cfg.setupOpts})
+        ''}
           ${lib.optionalString (cfg.highlight.enable || cfg.indent.enable) ''
-            vim.api.nvim_create_autocmd("FileType", {
-              group = "nvf_treesitter",
-              pattern = "*",
-              callback = function()
-                ${lib.optionalString cfg.highlight.enable ''
-                  pcall(vim.treesitter.start)
-                ''}${lib.optionalString cfg.indent.enable ''
-                  vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-                ''}
-              end,
-            })
+          vim.api.nvim_create_autocmd("FileType", {
+            group = "nvf_treesitter",
+            pattern = "*",
+            callback = function()
+              ${lib.optionalString cfg.highlight.enable ''
+            pcall(vim.treesitter.start)
+          ''}${lib.optionalString cfg.indent.enable ''
+            vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
           ''}
+            end,
+          })
+        ''}
         end
 
         ${lib.optionalString cfg.fold ''

modules/plugins/treesitter/treesitter.nix

@@ -5,6 +5,7 @@
 }: let
   inherit (lib.options) mkOption mkEnableOption literalExpression;
   inherit (lib.types) listOf package bool;
+  inherit (lib.nvim.types) mkPluginSetupOption;
 in {
   options.vim.treesitter = {
     enable = mkEnableOption "treesitter, also enabled automatically through language options";
@@ -66,5 +67,7 @@ in {
 
     indent = {enable = mkEnableOption "indentation with treesitter" // {default = true;};};
     highlight = {enable = mkEnableOption "highlighting with treesitter" // {default = true;};};
+
+    setupOpts = mkPluginSetupOption "nvim-treesitter" {};
   };
 }