From d3e387899fee7980ddfca1a413bb74de3b8afe58 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 29 Aug 2024 09:16:42 -0500
Subject: [PATCH] plugins/nvim-tree: use iconsPackage

---
 plugins/filetrees/nvim-tree.nix                    | 10 +++++++---
 tests/test-sources/plugins/filetrees/nvim-tree.nix |  7 +++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugins/filetrees/nvim-tree.nix b/plugins/filetrees/nvim-tree.nix
index d5bf37fb..c2635d43 100644
--- a/plugins/filetrees/nvim-tree.nix
+++ b/plugins/filetrees/nvim-tree.nix
@@ -41,6 +41,11 @@ in
 
     package = helpers.mkPluginPackageOption "nvim-tree" pkgs.vimPlugins.nvim-tree-lua;
 
+    iconsPackage = helpers.mkPackageOption {
+      name = "nvim-web-devicons";
+      default = pkgs.vimPlugins.nvim-web-devicons;
+    };
+
     disableNetrw = helpers.defaultNullOpts.mkBool false "Disable netrw";
 
     hijackNetrw = helpers.defaultNullOpts.mkBool true "Hijack netrw";
@@ -1154,10 +1159,9 @@ in
       '';
     in
     mkIf cfg.enable {
-      extraPlugins = with pkgs.vimPlugins; [
+      extraPlugins = [
         cfg.package
-        nvim-web-devicons
-      ];
+      ] ++ lib.optional (cfg.iconsPackage != null) cfg.iconsPackage;
 
       autoCmd =
         (optional autoOpenEnabled {
diff --git a/tests/test-sources/plugins/filetrees/nvim-tree.nix b/tests/test-sources/plugins/filetrees/nvim-tree.nix
index f0dae95b..e9938c99 100644
--- a/tests/test-sources/plugins/filetrees/nvim-tree.nix
+++ b/tests/test-sources/plugins/filetrees/nvim-tree.nix
@@ -256,4 +256,11 @@
       };
     };
   };
+
+  no-packages = {
+    plugins.nvim-tree = {
+      enable = true;
+      iconsPackage = null;
+    };
+  };
 }