nix-community/nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-11-08 19:46:06 +01:00
Code Activity

treewide: support mini-icons.mockdevIcons

Browse source 
Prevent the `web-devicons` enablement when using the `mini-icons`
module.
This commit is contained in:
Austin Horstman 2025-09-16 16:34:26 -05:00
parent a1d59a5542
commit ff3a250bd0
10 changed files with 61 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/by-name/alpha/default.nix
View file

@ -166,9 +166,12 @@ in
opt.iconsEnabled.isDefined opt.iconsEnabled.isDefined
&& cfg.iconsEnabled && cfg.iconsEnabled
&& !( && !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) )
{ {

9
plugins/by-name/barbar/default.nix
View file

@ -212,9 +212,12 @@ lib.nixvim.plugins.mkNeovimPlugin {
# TODO: added 2024-09-20 remove after 24.11 # TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = mkIf ( plugins.web-devicons = mkIf (
!( !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) { enable = mkOverride 1490 true; }; ) { enable = mkOverride 1490 true; };

9
plugins/by-name/bufferline/default.nix
View file

@ -663,9 +663,12 @@ lib.nixvim.plugins.mkNeovimPlugin {
# TODO: added 2024-09-20 remove after 24.11 # TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = lib.mkIf ( plugins.web-devicons = lib.mkIf (
!( !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) { enable = lib.mkOverride 1490 true; }; ) { enable = lib.mkOverride 1490 true; };

9
plugins/by-name/diffview/default.nix
View file

@ -826,9 +826,12 @@ in
# TODO: added 2024-09-20 remove after 24.11 # TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = mkIf ( plugins.web-devicons = mkIf (
!( !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) { enable = mkOverride 1490 true; }; ) { enable = mkOverride 1490 true; };

9
plugins/by-name/fzf-lua/default.nix
View file

@ -124,9 +124,12 @@ lib.nixvim.plugins.mkNeovimPlugin {
opts.iconsEnabled.isDefined opts.iconsEnabled.isDefined
&& cfg.iconsEnabled && cfg.iconsEnabled
&& !( && !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) )
{ {

9
plugins/by-name/lspsaga/deprecations.nix
View file

@ -40,9 +40,12 @@ lib: {
cfg.enable cfg.enable
&& (cfg.settings.ui.devicon or true) && (cfg.settings.ui.devicon or true)
&& !( && !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) )
{ {

11
plugins/by-name/neo-tree/default.nix
View file

@ -924,7 +924,7 @@ in
config = config =
let let
inherit (helpers) ifNonNull' mkRaw; inherit (helpers) ifNonNull';
processRendererComponent = processRendererComponent =
component: component:
@ -1126,9 +1126,12 @@ in
# TODO: added 2024-09-20 remove after 24.11 # TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = mkIf ( plugins.web-devicons = mkIf (
!( !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) { enable = mkOverride 1490 true; }; ) { enable = mkOverride 1490 true; };

9
plugins/by-name/nvim-tree/default.nix
View file

@ -134,9 +134,12 @@ lib.nixvim.plugins.mkNeovimPlugin {
# TODO: added 2024-09-20 remove after 24.11 # TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = lib.mkIf ( plugins.web-devicons = lib.mkIf (
!( !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) { enable = lib.mkOverride 1490 true; }; ) { enable = lib.mkOverride 1490 true; };

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

@ -103,9 +103,12 @@ lib.nixvim.plugins.mkNeovimPlugin {
# TODO: added 2024-09-20 remove after 24.11 # TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = mkIf ( plugins.web-devicons = mkIf (
!( !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) { enable = mkOverride 1490 true; }; ) { enable = mkOverride 1490 true; };

9
plugins/by-name/trouble/default.nix
View file

@ -383,9 +383,12 @@ lib.nixvim.plugins.mkNeovimPlugin {
# TODO: added 2024-09-20 remove after 24.11 # TODO: added 2024-09-20 remove after 24.11
plugins.web-devicons = lib.mkIf ( plugins.web-devicons = lib.mkIf (
!( !(
config.plugins.mini.enable (
&& config.plugins.mini.modules ? icons config.plugins.mini.enable
&& config.plugins.mini.mockDevIcons && config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
) )
) { enable = lib.mkOverride 1490 true; }; ) { enable = lib.mkOverride 1490 true; };
}; };