NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-11-10 07:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Created mkEnableTreesitterOption in the extendend library

Browse source
This commit is contained in:
isaacST08 2025-02-10 17:35:57 -07:00
commit 0b85f56868
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/types/default.nix
View file

@ -10,6 +10,6 @@
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 mkEnableTreesitterOption;
inherit (customTypes) char hexColor mergelessListOf; inherit (customTypes) char hexColor mergelessListOf;
} }

11
lib/types/languages.nix
View file

@ -1,7 +1,7 @@
{lib}: let {lib}: let
inherit (lib.options) mkOption mkPackageOption; inherit (lib.options) mkOption mkPackageOption;
inherit (lib.attrsets) attrNames; inherit (lib.attrsets) attrNames;
inherit (lib.types) listOf either enum submodule package; inherit (lib.types) listOf either enum submodule package bool;
diagnosticSubmodule = _: { diagnosticSubmodule = _: {
options = { options = {
@ -32,6 +32,13 @@
mkPackageOption pkgs ["${grammar} treesitter"] { mkPackageOption pkgs ["${grammar} treesitter"] {
default = ["vimPlugins" "nvim-treesitter" "builtGrammars" grammar]; default = ["vimPlugins" "nvim-treesitter" "builtGrammars" grammar];
}; };
mkEnableTreesitterOption = config: language:
mkOption {
type = bool;
default = config.vim.languages.enableTreesitter;
description = "Whether to enable ${language} treesitter";
};
in { in {
inherit diagnostics diagnosticSubmodule mkGrammarOption; inherit diagnostics diagnosticSubmodule mkGrammarOption mkEnableTreesitterOption;
} }

12
modules/plugins/languages/tex/treesitter.nix
View file

@ -4,21 +4,23 @@
lib, lib,
... ...
}: let }: let
inherit (lib.options) mkEnableOption; # inherit (lib.options) mkEnableOption;
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.types) mkGrammarOption; inherit (lib.nvim.types) mkGrammarOption mkEnableTreesitterOption;
cfg = config.vim.languages.tex; cfg = config.vim.languages.tex;
mkEnableTreesitterOption = description: mkEnableOption description // {default = config.vim.languages.enableTreesitter;}; # mkEnableTreesitterOption = description: mkEnableOption description // {default = config.vim.languages.enableTreesitter;};
in { in {
options.vim.languages.tex.treesitter = { options.vim.languages.tex.treesitter = {
latex = { latex = {
enable = mkEnableTreesitterOption "Whether to enable Latex treesitter"; # enable = mkEnableTreesitterOption "Whether to enable Latex treesitter";
enable = mkEnableTreesitterOption config "latex";
package = mkGrammarOption pkgs "latex"; package = mkGrammarOption pkgs "latex";
}; };
bibtex = { bibtex = {
enable = mkEnableTreesitterOption "Whether to enable Bibtex treesitter"; # enable = mkEnableTreesitterOption "Whether to enable Bibtex treesitter";
enable = mkEnableTreesitterOption config "bibtex";
package = mkGrammarOption pkgs "bibtex"; package = mkGrammarOption pkgs "bibtex";
}; };
}; };