From 535fc7d5d38a561884381dfc551d387eb0c1ad65 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 1 Jun 2023 10:31:23 +0200 Subject: [PATCH] plugins/treesitter-context: add missing warning when treesitter is not enabled --- plugins/languages/treesitter/treesitter-context.nix | 4 ++++ plugins/languages/treesitter/treesitter.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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];