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

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

@ -166,10 +166,13 @@ in
opt.iconsEnabled.isDefined
&& cfg.iconsEnabled
&& !(
(
config.plugins.mini.enable
&& config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
)
)
{
enable = lib.mkOverride 1490 true;

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

@ -212,10 +212,13 @@ lib.nixvim.plugins.mkNeovimPlugin {
# 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
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
)
) { enable = mkOverride 1490 true; };
keymaps = filter (keymap: keymap != null) (

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

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

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

@ -826,10 +826,13 @@ in
# 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
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
)
) { enable = mkOverride 1490 true; };
extraPlugins = [ cfg.package ];

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

@ -124,10 +124,13 @@ lib.nixvim.plugins.mkNeovimPlugin {
opts.iconsEnabled.isDefined
&& cfg.iconsEnabled
&& !(
(
config.plugins.mini.enable
&& config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
)
)
{
enable = lib.mkOverride 1490 true;

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

@ -40,10 +40,13 @@ lib: {
cfg.enable
&& (cfg.settings.ui.devicon or true)
&& !(
(
config.plugins.mini.enable
&& config.plugins.mini.modules ? icons
&& config.plugins.mini.mockDevIcons
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
)
)
{
enable = lib.mkOverride 1490 true;

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

@ -924,7 +924,7 @@ in
config =
let
inherit (helpers) ifNonNull' mkRaw;
inherit (helpers) ifNonNull';
processRendererComponent =
component:
@ -1126,10 +1126,13 @@ in
# 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
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
)
) { enable = mkOverride 1490 true; };
extraPlugins = [

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

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

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

@ -103,10 +103,13 @@ lib.nixvim.plugins.mkNeovimPlugin {
# 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
)
|| (config.plugins.mini-icons.enable && config.plugins.mini-icons.mockDevIcons)
)
) { enable = mkOverride 1490 true; };
extraConfigVim = mkIf (cfg.highlightTheme != null) ''

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

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