mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-07-13 18:54:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

plugins/telescope: iconsPackage -> icons provider options

Browse source
This commit is contained in:
Austin Horstman 2024-09-20 13:37:35 -05:00
parent 5ff98645ce
commit 38a183564b
No known key found for this signature in database
21 changed files with 88 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
plugins/by-name/telescope/default.nix
View file

@ -2,6 +2,7 @@
lib,
config,
pkgs,
options,
...
}:
with lib;
@ -9,7 +10,6 @@ let
inherit (lib.nixvim)
keymaps
mkNullOrOption
mkPackageOption
toLuaObject
;
in
@ -37,6 +37,17 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
]
"This option no longer has any effect now that the `plugin.telescope.keymaps` implementation uses `<cmd>`."
)
# TODO: added 2024-09-20 remove after 24.11
(lib.mkRemovedOptionModule
[
"plugins"
"telescope"
"iconsPackage"
]
''
Please use `plugins.web-devicons` or `plugins.mini.modules.icons` with `plugins.mini.mockDevIcons` instead.
''
)
];
extraOptions = {
@ -89,11 +100,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
'';
};
iconsPackage = lib.mkPackageOption pkgs [
"vimPlugins"
"nvim-web-devicons"
] { nullable = true; };
batPackage = lib.mkPackageOption pkgs "bat" {
nullable = true;
};
@ -101,7 +107,18 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin {
callSetup = false;
extraConfig = cfg: {
extraPlugins = mkIf (cfg.iconsPackage != null) [ cfg.iconsPackage ];
# TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = mkIf (
!(
config.plugins.mini.enable
&& config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
) { enable = mkOverride 1490 true; };
warnings = optional (options.plugins.web-devicons.enable.highestPrio == 1490) ''
Nixvim (plugins.telescope) `web-devicons` automatic installation is deprecated.
Please use `plugins.web-devicons` or `plugins.mini.modules.icons` with `plugins.mini.mockDevIcons` instead.
'';
extraConfigVim = mkIf (cfg.highlightTheme != null) ''
let $BAT_THEME = '${cfg.highlightTheme}'