diff --git a/plugins/languages/treesitter/treesitter-context.nix b/plugins/languages/treesitter/treesitter-context.nix index 077e6423..e9e452a2 100644 --- a/plugins/languages/treesitter/treesitter-context.nix +++ b/plugins/languages/treesitter/treesitter-context.nix @@ -49,6 +49,10 @@ in { cfg = config.plugins.treesitter-context; in mkIf cfg.enable { + warnings = mkIf (!config.plugins.treesitter.enable) [ + "Nixvim: treesitter-context needs treesitter to function as intended" + ]; + extraPlugins = [cfg.package]; plugins.treesitter.moduleConfig.context = { diff --git a/plugins/languages/treesitter/treesitter.nix b/plugins/languages/treesitter/treesitter.nix index d8290b72..cf6258ad 100644 --- a/plugins/languages/treesitter/treesitter.nix +++ b/plugins/languages/treesitter/treesitter.nix @@ -174,7 +174,7 @@ in { ''; }; - extraPlugins = with pkgs; + extraPlugins = if cfg.nixGrammars then [(cfg.package.withPlugins (_: cfg.grammarPackages))] else [cfg.package];