diff --git a/modules/dependencies.nix b/modules/dependencies.nix index 57cf0f2d..23af2f1b 100644 --- a/modules/dependencies.nix +++ b/modules/dependencies.nix @@ -8,6 +8,7 @@ let cfg = config.dependencies; packages = { + bat.default = "bat"; ctags.default = "ctags"; curl.default = "curl"; direnv.default = "direnv"; diff --git a/plugins/by-name/telescope/default.nix b/plugins/by-name/telescope/default.nix index 2be5c67f..a5e17aa1 100644 --- a/plugins/by-name/telescope/default.nix +++ b/plugins/by-name/telescope/default.nix @@ -37,6 +37,12 @@ lib.nixvim.plugins.mkNeovimPlugin { ] "This option no longer has any effect now that the `plugin.telescope.keymaps` implementation uses ``." ) + + # TODO: added 2025-04-07, remove after 25.05 + (lib.nixvim.mkRemovedPackageOptionModule { + plugin = "telescope"; + packageName = "bat"; + }) ]; extraOptions = { @@ -88,10 +94,6 @@ lib.nixvim.plugins.mkNeovimPlugin { added to `extraPlugins`. ''; }; - - batPackage = lib.mkPackageOption pkgs "bat" { - nullable = true; - }; }; callSetup = false; @@ -109,7 +111,7 @@ lib.nixvim.plugins.mkNeovimPlugin { let $BAT_THEME = '${cfg.highlightTheme}' ''; - extraPackages = [ cfg.batPackage ]; + dependencies.bat.enable = lib.mkDefault true; keymaps = mapAttrsToList ( key: mapping: diff --git a/tests/test-sources/plugins/by-name/telescope/default.nix b/tests/test-sources/plugins/by-name/telescope/default.nix index f0605d2e..20751ce2 100644 --- a/tests/test-sources/plugins/by-name/telescope/default.nix +++ b/tests/test-sources/plugins/by-name/telescope/default.nix @@ -35,11 +35,11 @@ }; no-packages = { - plugins.web-devicons.enable = false; - plugins.telescope = { - enable = true; - batPackage = null; + plugins = { + web-devicons.enable = false; + telescope.enable = true; }; + dependencies.bat.enable = false; }; mini-icons = {