From 873d7b51a73d2c35950c3ec8a5a017d801c11715 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 30 Aug 2024 20:03:17 -0500 Subject: [PATCH] plugins/telescope: add batPackage --- plugins/by-name/telescope/default.nix | 8 ++++++-- tests/test-sources/plugins/by-name/telescope/default.nix | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/by-name/telescope/default.nix b/plugins/by-name/telescope/default.nix index b7527d43..c7f6d2c2 100644 --- a/plugins/by-name/telescope/default.nix +++ b/plugins/by-name/telescope/default.nix @@ -21,8 +21,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin { maintainers = [ maintainers.GaetanLepage ]; - extraPackages = [ pkgs.bat ]; - # TODO introduced 2024-03-24: remove 2024-05-24 deprecateExtraOptions = true; optionsRenamedToSettings = [ "defaults" ]; @@ -95,6 +93,10 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin { "vimPlugins" "nvim-web-devicons" ] { nullable = true; }; + + batPackage = lib.mkPackageOption pkgs "bat" { + nullable = true; + }; }; callSetup = false; @@ -105,6 +107,8 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin { let $BAT_THEME = '${cfg.highlightTheme}' ''; + extraPackages = [ cfg.batPackage ]; + keymaps = mapAttrsToList ( key: mapping: let diff --git a/tests/test-sources/plugins/by-name/telescope/default.nix b/tests/test-sources/plugins/by-name/telescope/default.nix index 297f7eba..298d0b42 100644 --- a/tests/test-sources/plugins/by-name/telescope/default.nix +++ b/tests/test-sources/plugins/by-name/telescope/default.nix @@ -34,6 +34,7 @@ no-packages = { plugins.telescope = { enable = true; + batPackage = null; iconsPackage = null; }; };