NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2026-01-13 22:17:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

treewide: revert back to builtGrammars from grammarPlugins

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I5c24036a40ec6f2cc8bd85a1cc8e2db06a6a6964
This commit is contained in:
raf 2026-01-06 15:13:11 +03:00
commit bbc99da250
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/types/languages.nix
View file

@ -30,7 +30,7 @@
mkGrammarOption = pkgs: grammar: mkGrammarOption = pkgs: grammar:
mkPackageOption pkgs ["${grammar} treesitter"] { mkPackageOption pkgs ["${grammar} treesitter"] {
default = ["vimPlugins" "nvim-treesitter" "grammarPlugins" grammar]; default = ["vimPlugins" "nvim-treesitter" "builtGrammars" grammar];
}; };
in { in {
inherit diagnostics diagnosticSubmodule mkGrammarOption; inherit diagnostics diagnosticSubmodule mkGrammarOption;

2
modules/plugins/languages/python.nix
View file

@ -228,7 +228,7 @@ in {
package = mkOption { package = mkOption {
description = "Python treesitter grammar to use"; description = "Python treesitter grammar to use";
type = package; type = package;
default = pkgs.vimPlugins.nvim-treesitter.grammarPlugins.python; default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.python;
}; };
}; };

2
modules/plugins/languages/sql.nix
View file

@ -66,7 +66,7 @@ in {
package = mkOption { package = mkOption {
type = package; type = package;
default = pkgs.vimPlugins.nvim-treesitter.grammarPlugins.sql; default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql;
description = "SQL treesitter grammar to use"; description = "SQL treesitter grammar to use";
}; };
}; };

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

@ -25,14 +25,14 @@ in {
type = listOf package; type = listOf package;
default = []; default = [];
example = literalExpression '' example = literalExpression ''
with pkgs.vimPlugins.nvim-treesitter.grammarPlugins; [ with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
regex regex
kdl kdl
]; ];
''; '';
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.grammarPlugins`. you must use grammars from `pkgs.vimPlugins.nvim-treesitter.builtGrammars`.
You can use `pkgs.vimPlugins.nvim-treesitter.allGrammars` to install all grammars. You can use `pkgs.vimPlugins.nvim-treesitter.allGrammars` to install all grammars.
For languages already supported by nvf, you may use For languages already supported by nvf, you may use
@ -56,7 +56,7 @@ in {
internal = true; internal = true;
readOnly = true; readOnly = true;
type = listOf package; type = listOf package;
default = with pkgs.vimPlugins.nvim-treesitter.grammarPlugins; [c lua vim vimdoc query]; default = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [c lua vim vimdoc query];
description = '' description = ''
A list of treesitter grammars that will be installed by default A list of treesitter grammars that will be installed by default
if treesitter has been enabled and {option}`vim.treeesitter.addDefaultGrammars` if treesitter has been enabled and {option}`vim.treeesitter.addDefaultGrammars`

2
modules/plugins/ui/noice/config.nix
View file

@ -12,7 +12,7 @@
cfg = config.vim.ui.noice; cfg = config.vim.ui.noice;
tscfg = config.vim.treesitter; tscfg = config.vim.treesitter;
defaultGrammars = with pkgs.vimPlugins.nvim-treesitter.grammarPlugins; [vim regex lua bash markdown]; defaultGrammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [vim regex lua bash markdown];
in { in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
vim = { vim = {