diff --git a/plugins/git/diffview.nix b/plugins/git/diffview.nix index 22d1c735..9af78dac 100644 --- a/plugins/git/diffview.nix +++ b/plugins/git/diffview.nix @@ -88,6 +88,11 @@ in package = helpers.mkPluginPackageOption "diffview" pkgs.vimPlugins.diffview-nvim; + iconsPackage = helpers.mkPackageOption { + name = "nvim-web-devicons"; + default = pkgs.vimPlugins.nvim-web-devicons; + }; + diffBinaries = mkBool false '' Show diffs for binaries ''; @@ -817,7 +822,10 @@ in }; in mkIf cfg.enable { - extraPlugins = [ cfg.package ] ++ (optional cfg.useIcons pkgs.vimPlugins.nvim-web-devicons); + extraPlugins = [ + cfg.package + ] ++ (optional (cfg.iconsPackage != null && cfg.useIcons) cfg.iconsPackage); + extraConfigLua = '' require("diffview").setup(${helpers.toLuaObject setupOptions}) ''; diff --git a/tests/test-sources/plugins/git/diffview.nix b/tests/test-sources/plugins/git/diffview.nix index 9a513451..9b182a4a 100644 --- a/tests/test-sources/plugins/git/diffview.nix +++ b/tests/test-sources/plugins/git/diffview.nix @@ -161,4 +161,11 @@ }; }; }; + + no-packages = { + plugins.diffview = { + enable = true; + iconsPackage = null; + }; + }; }