mirror of
https://github.com/nix-community/nixvim.git
synced 2025-11-08 19:46:06 +01:00
treewide: support mini-icons.mockdevIcons
Prevent the `web-devicons` enablement when using the `mini-icons` module.
This commit is contained in:
parent
a1d59a5542
commit
ff3a250bd0
10 changed files with 61 additions and 31 deletions
|
|
@ -166,10 +166,13 @@ in
|
||||||
opt.iconsEnabled.isDefined
|
opt.iconsEnabled.isDefined
|
||||||
&& cfg.iconsEnabled
|
&& cfg.iconsEnabled
|
||||||
&& !(
|
&& !(
|
||||||
|
(
|
||||||
config.plugins.mini.enable
|
config.plugins.mini.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
enable = lib.mkOverride 1490 true;
|
enable = lib.mkOverride 1490 true;
|
||||||
|
|
|
||||||
|
|
@ -212,10 +212,13 @@ 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.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
) { enable = mkOverride 1490 true; };
|
) { enable = mkOverride 1490 true; };
|
||||||
|
|
||||||
keymaps = filter (keymap: keymap != null) (
|
keymaps = filter (keymap: keymap != null) (
|
||||||
|
|
|
||||||
|
|
@ -663,10 +663,13 @@ 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.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
) { enable = lib.mkOverride 1490 true; };
|
) { enable = lib.mkOverride 1490 true; };
|
||||||
|
|
||||||
opts.termguicolors = true;
|
opts.termguicolors = true;
|
||||||
|
|
|
||||||
|
|
@ -826,10 +826,13 @@ 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.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
) { enable = mkOverride 1490 true; };
|
) { enable = mkOverride 1490 true; };
|
||||||
|
|
||||||
extraPlugins = [ cfg.package ];
|
extraPlugins = [ cfg.package ];
|
||||||
|
|
|
||||||
|
|
@ -124,10 +124,13 @@ lib.nixvim.plugins.mkNeovimPlugin {
|
||||||
opts.iconsEnabled.isDefined
|
opts.iconsEnabled.isDefined
|
||||||
&& cfg.iconsEnabled
|
&& cfg.iconsEnabled
|
||||||
&& !(
|
&& !(
|
||||||
|
(
|
||||||
config.plugins.mini.enable
|
config.plugins.mini.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
enable = lib.mkOverride 1490 true;
|
enable = lib.mkOverride 1490 true;
|
||||||
|
|
|
||||||
|
|
@ -40,10 +40,13 @@ lib: {
|
||||||
cfg.enable
|
cfg.enable
|
||||||
&& (cfg.settings.ui.devicon or true)
|
&& (cfg.settings.ui.devicon or true)
|
||||||
&& !(
|
&& !(
|
||||||
|
(
|
||||||
config.plugins.mini.enable
|
config.plugins.mini.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
enable = lib.mkOverride 1490 true;
|
enable = lib.mkOverride 1490 true;
|
||||||
|
|
|
||||||
|
|
@ -924,7 +924,7 @@ in
|
||||||
|
|
||||||
config =
|
config =
|
||||||
let
|
let
|
||||||
inherit (helpers) ifNonNull' mkRaw;
|
inherit (helpers) ifNonNull';
|
||||||
|
|
||||||
processRendererComponent =
|
processRendererComponent =
|
||||||
component:
|
component:
|
||||||
|
|
@ -1126,10 +1126,13 @@ 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.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
) { enable = mkOverride 1490 true; };
|
) { enable = mkOverride 1490 true; };
|
||||||
|
|
||||||
extraPlugins = [
|
extraPlugins = [
|
||||||
|
|
|
||||||
|
|
@ -134,10 +134,13 @@ 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.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
) { enable = lib.mkOverride 1490 true; };
|
) { enable = lib.mkOverride 1490 true; };
|
||||||
|
|
||||||
autoCmd =
|
autoCmd =
|
||||||
|
|
|
||||||
|
|
@ -103,10 +103,13 @@ 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.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
) { enable = mkOverride 1490 true; };
|
) { enable = mkOverride 1490 true; };
|
||||||
|
|
||||||
extraConfigVim = mkIf (cfg.highlightTheme != null) ''
|
extraConfigVim = mkIf (cfg.highlightTheme != null) ''
|
||||||
|
|
|
||||||
|
|
@ -383,10 +383,13 @@ 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.enable
|
||||||
&& config.plugins.mini.modules ? icons
|
&& config.plugins.mini.modules ? icons
|
||||||
&& config.plugins.mini.mockDevIcons
|
&& config.plugins.mini.mockDevIcons
|
||||||
)
|
)
|
||||||
|
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
|
||||||
|
)
|
||||||
) { enable = lib.mkOverride 1490 true; };
|
) { enable = lib.mkOverride 1490 true; };
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue