From 4ab24e77a57667e5be39186fc241d8ae364ca8d5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 29 Aug 2024 09:18:16 -0500 Subject: [PATCH] plugins/neo-tree: use iconsPackage --- plugins/filetrees/neo-tree.nix | 10 +++++++--- tests/test-sources/plugins/filetrees/neo-tree.nix | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/plugins/filetrees/neo-tree.nix b/plugins/filetrees/neo-tree.nix index 0d2a314f..a13e56c7 100644 --- a/plugins/filetrees/neo-tree.nix +++ b/plugins/filetrees/neo-tree.nix @@ -57,6 +57,11 @@ in package = helpers.mkPluginPackageOption "neo-tree" pkgs.vimPlugins.neo-tree-nvim; + iconsPackage = helpers.mkPackageOption { + name = "nvim-web-devicons"; + default = pkgs.vimPlugins.nvim-web-devicons; + }; + sources = helpers.defaultNullOpts.mkListOf types.str [ @@ -1116,10 +1121,9 @@ in // cfg.extraOptions; in mkIf cfg.enable { - extraPlugins = with pkgs.vimPlugins; [ + extraPlugins = [ cfg.package - nvim-web-devicons - ]; + ] ++ lib.optional (cfg.iconsPackage != null) cfg.iconsPackage; extraConfigLua = '' require('neo-tree').setup(${helpers.toLuaObject setupOptions}) diff --git a/tests/test-sources/plugins/filetrees/neo-tree.nix b/tests/test-sources/plugins/filetrees/neo-tree.nix index dea59478..ba74bdfa 100644 --- a/tests/test-sources/plugins/filetrees/neo-tree.nix +++ b/tests/test-sources/plugins/filetrees/neo-tree.nix @@ -437,4 +437,11 @@ }; }; }; + + no-packages = { + plugins.neo-tree = { + enable = true; + iconsPackage = null; + }; + }; }