NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-06 02:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

languages: move to mkGrammarOption in remaining languages

Browse source
This commit is contained in:
poz 2025-07-21 10:53:47 +02:00
commit adfb0d1fec
No known key found for this signature in database
3 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
inherit (lib.nvim.dag) entryBefore; inherit (lib.nvim.dag) entryBefore;
inherit (lib.nvim.types) mkServersOption; inherit (lib.nvim.types) mkGrammarOption mkServersOption;
cfg = config.vim.languages.python; cfg = config.vim.languages.python;
@ -219,11 +219,7 @@ in {
treesitter = { treesitter = {
enable = mkEnableOption "Python treesitter" // {default = config.vim.languages.enableTreesitter;}; enable = mkEnableOption "Python treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkOption { package = mkGrammarOption pkgs "python";
description = "Python treesitter grammar to use";
type = package;
default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.python;
};
}; };
lsp = { lsp = {

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

@ -9,7 +9,7 @@
inherit (lib.meta) getExe; inherit (lib.meta) getExe;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.types) enum listOf package str; inherit (lib.types) enum listOf package str;
inherit (lib.nvim.types) diagnostics mkServersOption; inherit (lib.nvim.types) diagnostics mkGrammarOption mkServersOption;
inherit (lib.nvim.attrsets) mapListToAttrs; inherit (lib.nvim.attrsets) mapListToAttrs;
inherit (lib.generators) mkLuaInline; inherit (lib.generators) mkLuaInline;
@ -66,12 +66,7 @@ in {
treesitter = { treesitter = {
enable = mkEnableOption "SQL treesitter" // {default = config.vim.languages.enableTreesitter;}; enable = mkEnableOption "SQL treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkGrammarOption pkgs "sql";
package = mkOption {
type = package;
default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql;
description = "SQL treesitter grammar to use";
};
}; };
lsp = { lsp = {

1
modules/plugins/languages/yaml.nix
View file

@ -49,7 +49,6 @@ in {
treesitter = { treesitter = {
enable = mkEnableOption "YAML treesitter" // {default = config.vim.languages.enableTreesitter;}; enable = mkEnableOption "YAML treesitter" // {default = config.vim.languages.enableTreesitter;};
package = mkGrammarOption pkgs "yaml"; package = mkGrammarOption pkgs "yaml";
}; };