NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-05-21 14:26:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

treesitter: support usage of pkgs.tree-sitter-grammars

Browse source
This commit is contained in:
Snoweuph 2026-05-15 14:39:03 +02:00
commit 53e89665ce
No known key found for this signature in database
GPG key ID: BEFC41DA223CEC55
4 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/manual/release-notes/rl-0.9.md
View file

@ -291,6 +291,10 @@
[Snoweuph](https://github.com/snoweuph) [Snoweuph](https://github.com/snoweuph)
- Allow the usage of `pks.tree-sitter-grammars` in
{option}`vim.treesitter.grammars` and language module tree-sitter package
options created via `mkGrammarOption`.
- Add `emmet-ls` to the supported LSPs for all languages it supports. - Add `emmet-ls` to the supported LSPs for all languages it supports.
- Added {option}`vim.treesitter.queries` to support adding custom queries. - Added {option}`vim.treesitter.queries` to support adding custom queries.

2
lib/types/default.nix
View file

@ -10,7 +10,7 @@
in { in {
inherit (typesDag) dagOf; inherit (typesDag) dagOf;
inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType; inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType;
inherit (typesLanguage) diagnostics mkGrammarOption; inherit (typesLanguage) diagnostics mkGrammarOption mkTreesitterGrammarOption;
inherit (typesLsp) mkLspPresetEnableOption; inherit (typesLsp) mkLspPresetEnableOption;
inherit (customTypes) char hexColor mergelessListOf deprecatedSingleOrListOf enumWithRename; inherit (customTypes) char hexColor mergelessListOf deprecatedSingleOrListOf enumWithRename;
} }

13
lib/types/languages.nix
View file

@ -33,6 +33,17 @@
default = ["vimPlugins" "nvim-treesitter" "grammarPlugins" grammar]; default = ["vimPlugins" "nvim-treesitter" "grammarPlugins" grammar];
nullable = true; nullable = true;
}; };
# Prefer using `mkGrammarOption` and only use this, for grammars,
# not in `vimPlugins.nvim-treesitter.grammarPlugins`.
# Grammars from `tree-sitter-grammars.tree-sitter-<name>` should mostly
# just work, but should be tested extra, as we currently only use them
# for a small subset of language modules.
mkTreesitterGrammarOption = pkgs: grammar:
mkPackageOption pkgs ["${grammar} treesitter"] {
default = ["tree-sitter-grammars" "tree-sitter-${grammar}"];
nullable = true;
};
in { in {
inherit diagnostics diagnosticSubmodule mkGrammarOption; inherit diagnostics diagnosticSubmodule mkGrammarOption mkTreesitterGrammarOption;
} }

8
modules/plugins/treesitter/treesitter.nix
View file

@ -41,8 +41,12 @@ in {
''; '';
description = '' description = ''
List of treesitter grammars to install. For grammars to be installed properly, List of treesitter grammars to install. For grammars to be installed properly,
you must use grammars from `pkgs.vimPlugins.nvim-treesitter.parsers` or `pkgs.vimPlugins.nvim-treesitter.grammarPlugins`. you must use grammars from one of those:
You can use `pkgs.vimPlugins.nvim-treesitter.allGrammars` to install all grammars. - `pkgs.vimPlugins.nvim-treesitter.parsers`
- `pkgs.vimPlugins.nvim-treesitter.grammarPlugins`
- `pkgs.tree-sitter-grammars` (mostly untested)
You can use `pkgs.vimPlugins.nvim-treesitter.allGrammars` to install all grammars shipped with `nvim-treesitter`.
For languages already supported by nvf, you may use For languages already supported by nvf, you may use
{option}`vim.language.<lang>.treesitter` options, which will automatically add {option}`vim.language.<lang>.treesitter` options, which will automatically add