diff --git a/lib/types/languages.nix b/lib/types/languages.nix index 29639047..5e935159 100644 --- a/lib/types/languages.nix +++ b/lib/types/languages.nix @@ -33,10 +33,10 @@ default = ["vimPlugins" "nvim-treesitter" "builtGrammars" grammar]; }; - mkEnableTreesitterOption = config: language: + mkEnableTreesitterOption = defaultCondition: language: mkOption { type = bool; - default = config.vim.languages.enableTreesitter; + default = defaultCondition; description = "Whether to enable ${language} treesitter"; }; in { diff --git a/modules/plugins/languages/tex/treesitter.nix b/modules/plugins/languages/tex/treesitter.nix index fcebaa99..d9c3754b 100644 --- a/modules/plugins/languages/tex/treesitter.nix +++ b/modules/plugins/languages/tex/treesitter.nix @@ -5,17 +5,19 @@ ... }: let inherit (lib.modules) mkIf mkMerge; - inherit (lib.nvim.types) mkGrammarOption mkEnableTreesitterOption; + inherit (lib.nvim.types) mkGrammarOption; + + mkEnableTreesitterOption = lib.nvim.types.mkEnableTreesitterOption config.vim.languages.enableTreesitter; cfg = config.vim.languages.tex; in { options.vim.languages.tex.treesitter = { latex = { - enable = mkEnableTreesitterOption config "latex"; + enable = mkEnableTreesitterOption "latex"; package = mkGrammarOption pkgs "latex"; }; bibtex = { - enable = mkEnableTreesitterOption config "bibtex"; + enable = mkEnableTreesitterOption "bibtex"; package = mkGrammarOption pkgs "bibtex"; }; };