From 8e92c868ff7ffe84e46a58fa33fe718137a50e16 Mon Sep 17 00:00:00 2001 From: Folke Lemaitre Date: Wed, 3 Jul 2024 17:57:51 +0200 Subject: [PATCH] refactor(icons): move devicons stuff to util.mini --- lua/lazyvim/plugins/ui.lua | 36 +----------------------------------- lua/lazyvim/util/mini.lua | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua index d0ba6944..c7dc7884 100644 --- a/lua/lazyvim/plugins/ui.lua +++ b/lua/lazyvim/plugins/ui.lua @@ -303,41 +303,7 @@ return { }, -- icons - { - "echasnovski/mini.icons", - lazy = true, - opts = {}, - init = function() - package.preload["nvim-web-devicons"] = function() - local Icons = require("mini.icons") - local ret = {} - package.loaded["nvim-web-devicons"] = ret - Icons.mock_nvim_web_devicons() - - local function get(cat) - local all = {} - for _, name in ipairs(Icons.list(cat)) do - local icon, color = ret.get_icon_color(cat == "file" and name, cat == "extension" and name) - all[name] = { icon = icon, color = color } - end - return all - end - - ret.get_icons_by_extension = function() - return get("extension") - end - - ret.get_icons_by_filename = function() - return get("file") - end - - ret.get_icons = function() - return vim.tbl_extend("force", get("file"), get("extension")) - end - return ret - end - end, - }, + { "echasnovski/mini.icons", lazy = true, opts = {}, init = LazyVim.mini.devicons }, -- ui components { "MunifTanjim/nui.nvim", lazy = true }, diff --git a/lua/lazyvim/util/mini.lua b/lua/lazyvim/util/mini.lua index a0fe407b..0ba5e34b 100644 --- a/lua/lazyvim/util/mini.lua +++ b/lua/lazyvim/util/mini.lua @@ -148,4 +148,35 @@ function M.pairs(opts) end end +function M.devicons() + package.preload["nvim-web-devicons"] = function() + local Icons = require("mini.icons") + local ret = {} + package.loaded["nvim-web-devicons"] = ret + Icons.mock_nvim_web_devicons() + + local function get(cat) + local all = {} + for _, name in ipairs(Icons.list(cat)) do + local icon, color = ret.get_icon_color(cat == "file" and name, cat == "extension" and name) + all[name] = { icon = icon, color = color } + end + return all + end + + ret.get_icons_by_extension = function() + return get("extension") + end + + ret.get_icons_by_filename = function() + return get("file") + end + + ret.get_icons = function() + return vim.tbl_extend("force", get("file"), get("extension")) + end + return ret + end +end + return M