mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 16:39:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

plugins/barbar: use iconsPackage

Browse source
This commit is contained in:
Austin Horstman 2024-08-29 09:21:20 -05:00
parent 4ab24e77a5
commit f59a3c70aa
No known key found for this signature in database
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/bufferlines/barbar.nix
View file

@ -55,7 +55,6 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin config {
name = "barbar"; name = "barbar";
originalName = "barbar.nvim"; originalName = "barbar.nvim";
defaultPackage = pkgs.vimPlugins.barbar-nvim; defaultPackage = pkgs.vimPlugins.barbar-nvim;
extraPlugins = [ pkgs.vimPlugins.nvim-web-devicons ];
maintainers = [ maintainers.GaetanLepage ]; maintainers = [ maintainers.GaetanLepage ];
@ -197,6 +196,11 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin config {
); );
extraOptions = { extraOptions = {
iconsPackage = lib.nixvim.mkPackageOption {
name = "nvim-web-devicons";
default = pkgs.vimPlugins.nvim-web-devicons;
};
keymaps = mapAttrs ( keymaps = mapAttrs (
optionName: funcName: optionName: funcName:
mkNullOrOption' { mkNullOrOption' {
@ -214,6 +218,8 @@ lib.nixvim.neovim-plugin.mkNeovimPlugin config {
}; };
extraConfig = cfg: { extraConfig = cfg: {
extraPlugins = mkIf (cfg.iconsPackage != null) [ cfg.iconsPackage ];
keymaps = filter (keymap: keymap != null) ( keymaps = filter (keymap: keymap != null) (
# TODO: switch to `attrValues cfg.keymaps` when removing the deprecation warnings above: # TODO: switch to `attrValues cfg.keymaps` when removing the deprecation warnings above:
attrValues (filterAttrs (n: v: n != "silent") cfg.keymaps) attrValues (filterAttrs (n: v: n != "silent") cfg.keymaps)

8
tests/test-sources/plugins/bufferlines/barbar.nix
View file

@ -219,4 +219,12 @@
}; };
}; };
}; };
no-packages = {
plugins.barbar = {
enable = true;
iconsPackage = null;
settings.icons.filetype.enabled = false;
};
};
} }