mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-22 17:03:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

plugins/treesitter: revert add iconsPackage

Browse source
This commit is contained in:
Austin Horstman 2024-08-30 08:07:59 -05:00
parent 2704133fe3
commit bcda408e78
No known key found for this signature in database
2 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/languages/treesitter/treesitter.nix
View file

@ -324,11 +324,6 @@ helpers.neovim-plugin.mkNeovimPlugin config {
description = "Grammar packages to install"; description = "Grammar packages to install";
}; };
iconsPackage = helpers.mkPackageOption {
name = "nvim-web-devicons";
default = pkgs.vimPlugins.nvim-web-devicons;
};
# TODO: Implement rawLua support to be passed into extraConfigLua. # TODO: Implement rawLua support to be passed into extraConfigLua.
languageRegister = mkOption { languageRegister = mkOption {
type = with types; attrsOf (coercedTo str toList (listOf str)); type = with types; attrsOf (coercedTo str toList (listOf str));
@ -416,11 +411,10 @@ helpers.neovim-plugin.mkNeovimPlugin config {
extraFiles = mkIf cfg.nixvimInjections { "queries/nix/injections.scm".source = ./injections.scm; }; extraFiles = mkIf cfg.nixvimInjections { "queries/nix/injections.scm".source = ./injections.scm; };
extraPlugins = extraPlugins = mkIf (cfg.package != null) [
lib.optional (cfg.iconsPackage != null) cfg.iconsPackage (mkIf cfg.nixGrammars (cfg.package.withPlugins (_: cfg.grammarPackages)))
++ lib.optional (cfg.package != null) ( (mkIf (!cfg.nixGrammars) cfg.package)
if cfg.nixGrammars then cfg.package.withPlugins (_: cfg.grammarPackages) else cfg.package ];
);
extraPackages = [ extraPackages = [
cfg.gccPackage cfg.gccPackage

7
tests/test-sources/plugins/languages/treesitter/treesitter.nix
View file

@ -134,11 +134,4 @@
}; };
}; };
}; };
no-icons = {
plugins.treesitter = {
enable = true;
iconsPackage = null;
};
};
} }