diff --git a/lua/lazyvim/plugins/extras/coding/copilot.lua b/lua/lazyvim/plugins/extras/coding/copilot.lua index a9897107..8f0680ea 100644 --- a/lua/lazyvim/plugins/extras/coding/copilot.lua +++ b/lua/lazyvim/plugins/extras/coding/copilot.lua @@ -27,7 +27,7 @@ return { } table.insert(opts.sections.lualine_x, 2, { function() - local icon = require("lazyvim.config").icons.kinds.Copilot + local icon = LazyVim.config.icons.kinds.Copilot local status = require("copilot.api").status.data return icon .. (status.message or "") end, diff --git a/lua/lazyvim/plugins/extras/coding/tabnine.lua b/lua/lazyvim/plugins/extras/coding/tabnine.lua index a255120e..f02fccc9 100644 --- a/lua/lazyvim/plugins/extras/coding/tabnine.lua +++ b/lua/lazyvim/plugins/extras/coding/tabnine.lua @@ -42,7 +42,7 @@ return { optional = true, event = "VeryLazy", opts = function(_, opts) - local icon = require("lazyvim.config").icons.kinds.TabNine + local icon = LazyVim.config.icons.kinds.TabNine table.insert(opts.sections.lualine_x, 2, LazyVim.lualine.cmp_source("cmp_tabnine", icon)) end, }, diff --git a/lua/lazyvim/plugins/extras/editor/aerial.lua b/lua/lazyvim/plugins/extras/editor/aerial.lua index ad527aae..d2486c22 100644 --- a/lua/lazyvim/plugins/extras/editor/aerial.lua +++ b/lua/lazyvim/plugins/extras/editor/aerial.lua @@ -1,12 +1,10 @@ -local Config = require("lazyvim.config") - return { desc = "Aerial Symbol Browser", { "stevearc/aerial.nvim", event = "LazyFile", opts = function() - local icons = vim.deepcopy(Config.icons.kinds) + local icons = vim.deepcopy(LazyVim.config.icons.kinds) -- HACK: fix lua's weird choice for `Package` for control -- structures like if/else/for/etc. @@ -14,8 +12,8 @@ return { ---@type table|false local filter_kind = false - if Config.kind_filter then - filter_kind = assert(vim.deepcopy(Config.kind_filter)) + if LazyVim.config.kind_filter then + filter_kind = assert(vim.deepcopy(LazyVim.config.kind_filter)) filter_kind._ = filter_kind.default filter_kind.default = nil end diff --git a/lua/lazyvim/plugins/extras/editor/fzf.lua b/lua/lazyvim/plugins/extras/editor/fzf.lua index b92a4037..8a0a2927 100644 --- a/lua/lazyvim/plugins/extras/editor/fzf.lua +++ b/lua/lazyvim/plugins/extras/editor/fzf.lua @@ -30,7 +30,7 @@ end local function symbols_filter(entry, ctx) if ctx.symbols_filter == nil then - ctx.symbols_filter = require("lazyvim.config").get_kind_filter(ctx.bufnr) or false + ctx.symbols_filter = LazyVim.config.get_kind_filter(ctx.bufnr) or false end if ctx.symbols_filter == false then return true diff --git a/lua/lazyvim/plugins/extras/editor/navic.lua b/lua/lazyvim/plugins/extras/editor/navic.lua index e89bc11f..642a4a99 100644 --- a/lua/lazyvim/plugins/extras/editor/navic.lua +++ b/lua/lazyvim/plugins/extras/editor/navic.lua @@ -18,7 +18,7 @@ return { separator = " ", highlight = true, depth_limit = 5, - icons = require("lazyvim.config").icons.kinds, + icons = LazyVim.config.icons.kinds, lazy_update_context = true, } end, diff --git a/lua/lazyvim/plugins/extras/editor/outline.lua b/lua/lazyvim/plugins/extras/editor/outline.lua index abc4e6c0..575d6ec6 100644 --- a/lua/lazyvim/plugins/extras/editor/outline.lua +++ b/lua/lazyvim/plugins/extras/editor/outline.lua @@ -12,7 +12,6 @@ return { keys = { { "cs", "Outline", desc = "Toggle Outline" } }, cmd = "Outline", opts = function() - local Config = require("lazyvim.config") local defaults = require("outline.config").defaults local opts = { symbols = {}, @@ -22,14 +21,14 @@ return { down_and_jump = "", }, } - local filter = Config.kind_filter + local filter = LazyVim.config.kind_filter if type(filter) == "table" then filter = filter.default if type(filter) == "table" then for kind, symbol in pairs(defaults.symbols) do opts.symbols[kind] = { - icon = Config.icons.kinds[kind] or symbol.icon, + icon = LazyVim.config.icons.kinds[kind] or symbol.icon, hl = symbol.hl, } if not vim.tbl_contains(filter, kind) then diff --git a/lua/lazyvim/plugins/extras/editor/telescope.lua b/lua/lazyvim/plugins/extras/editor/telescope.lua index 5047f5f6..9d40dcdf 100644 --- a/lua/lazyvim/plugins/extras/editor/telescope.lua +++ b/lua/lazyvim/plugins/extras/editor/telescope.lua @@ -133,7 +133,7 @@ return { "ss", function() require("telescope.builtin").lsp_document_symbols({ - symbols = require("lazyvim.config").get_kind_filter(), + symbols = LazyVim.config.get_kind_filter(), }) end, desc = "Goto Symbol", @@ -142,7 +142,7 @@ return { "sS", function() require("telescope.builtin").lsp_dynamic_workspace_symbols({ - symbols = require("lazyvim.config").get_kind_filter(), + symbols = LazyVim.config.get_kind_filter(), }) end, desc = "Goto Symbol (Workspace)", diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua index de3ecc80..fceb3055 100644 --- a/lua/lazyvim/plugins/lsp/init.lua +++ b/lua/lazyvim/plugins/lsp/init.lua @@ -170,7 +170,7 @@ return { if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●" or function(diagnostic) - local icons = require("lazyvim.config").icons.diagnostics + local icons = LazyVim.config.icons.diagnostics for d, icon in pairs(icons) do if diagnostic.severity == vim.diagnostic.severity[d:upper()] then return icon diff --git a/lua/lazyvim/plugins/ui.lua b/lua/lazyvim/plugins/ui.lua index 384ec590..8adb760c 100644 --- a/lua/lazyvim/plugins/ui.lua +++ b/lua/lazyvim/plugins/ui.lua @@ -61,7 +61,7 @@ return { diagnostics = "nvim_lsp", always_show_bufferline = false, diagnostics_indicator = function(_, _, diag) - local icons = require("lazyvim.config").icons.diagnostics + local icons = LazyVim.config.icons.diagnostics local ret = (diag.error and icons.Error .. diag.error .. " " or "") .. (diag.warning and icons.Warn .. diag.warning or "") return vim.trim(ret) @@ -112,7 +112,7 @@ return { local lualine_require = require("lualine_require") lualine_require.require = require - local icons = require("lazyvim.config").icons + local icons = LazyVim.config.icons vim.o.laststatus = vim.g.lualine_laststatus diff --git a/lua/lazyvim/plugins/xtras.lua b/lua/lazyvim/plugins/xtras.lua index 24d5fcd2..761569c5 100644 --- a/lua/lazyvim/plugins/xtras.lua +++ b/lua/lazyvim/plugins/xtras.lua @@ -1,5 +1,3 @@ -local Config = require("lazyvim.config") - -- Some extras need to be loaded before others local prios = { ["lazyvim.plugins.extras.test.core"] = 1, @@ -13,7 +11,7 @@ local prios = { } ---@type string[] -local extras = LazyVim.dedup(Config.json.data.extras) +local extras = LazyVim.dedup(LazyVim.config.json.data.extras) local version = vim.version() local v = version.major .. "_" .. version.minor diff --git a/lua/lazyvim/util/extras.lua b/lua/lazyvim/util/extras.lua index 2fdef824..07cb27e0 100644 --- a/lua/lazyvim/util/extras.lua +++ b/lua/lazyvim/util/extras.lua @@ -1,4 +1,3 @@ -local Config = require("lazyvim.config") local Float = require("lazy.view.float") local LazyConfig = require("lazy.core.config") local Plugin = require("lazy.core.plugin") @@ -124,7 +123,7 @@ function M.get_extra(source, modname) imports = imports, desc = require(modname).desc, recommended = recommended, - managed = vim.tbl_contains(Config.json.data.extras, modname) or not enabled, + managed = vim.tbl_contains(LazyVim.config.json.data.extras, modname) or not enabled, plugins = plugins, optional = optional, } @@ -169,17 +168,17 @@ function X:toggle() return end extra.enabled = not extra.enabled - Config.json.data.extras = vim.tbl_filter(function(name) + LazyVim.config.json.data.extras = vim.tbl_filter(function(name) return name ~= extra.module - end, Config.json.data.extras) + end, LazyVim.config.json.data.extras) M.state = vim.tbl_filter(function(name) return name ~= extra.module end, M.state) if extra.enabled then - table.insert(Config.json.data.extras, extra.module) + table.insert(LazyVim.config.json.data.extras, extra.module) M.state[#M.state + 1] = extra.module end - table.sort(Config.json.data.extras) + table.sort(LazyVim.config.json.data.extras) LazyVim.json.save() LazyVim.info( "`" diff --git a/lua/lazyvim/util/json.lua b/lua/lazyvim/util/json.lua index 60466a45..3abdad75 100644 --- a/lua/lazyvim/util/json.lua +++ b/lua/lazyvim/util/json.lua @@ -1,5 +1,3 @@ -local Config = require("lazyvim.config") - ---@class lazyvim.util.json local M = {} @@ -46,18 +44,18 @@ function M.encode(value) end function M.save() - Config.json.data.version = Config.json.version + LazyVim.config.json.data.version = LazyVim.config.json.version local path = vim.fn.stdpath("config") .. "/lazyvim.json" local f = io.open(path, "w") if f then - f:write(LazyVim.json.encode(Config.json.data)) + f:write(LazyVim.json.encode(LazyVim.config.json.data)) f:close() end end function M.migrate() - LazyVim.info("Migrating `lazyvim.json` to version `" .. Config.json.version .. "`") - local json = Config.json + LazyVim.info("Migrating `lazyvim.json` to version `" .. LazyVim.config.json.version .. "`") + local json = LazyVim.config.json -- v0 if not json.data.version then diff --git a/lua/lazyvim/util/lualine.lua b/lua/lazyvim/util/lualine.lua index aad22677..6284504a 100644 --- a/lua/lazyvim/util/lualine.lua +++ b/lua/lazyvim/util/lualine.lua @@ -30,7 +30,7 @@ function M.cmp_source(name, icon) return { function() - return icon or require("lazyvim.config").icons.kinds[name:sub(1, 1):upper() .. name:sub(2)] + return icon or LazyVim.config.icons.kinds[name:sub(1, 1):upper() .. name:sub(2)] end, cond = function() return status() ~= nil diff --git a/lua/lazyvim/util/news.lua b/lua/lazyvim/util/news.lua index 5434649a..d1a6b44b 100644 --- a/lua/lazyvim/util/news.lua +++ b/lua/lazyvim/util/news.lua @@ -1,5 +1,3 @@ -local Config = require("lazyvim.config") - ---@class lazyvim.util.news local M = {} @@ -13,13 +11,13 @@ end function M.setup() vim.schedule(function() - if Config.news.lazyvim then - if not Config.json.data.news["NEWS.md"] then + if LazyVim.config.news.lazyvim then + if not LazyVim.config.json.data.news["NEWS.md"] then M.welcome() end M.lazyvim(true) end - if Config.news.neovim then + if LazyVim.config.news.neovim then M.neovim(true) end end) @@ -61,12 +59,12 @@ function M.open(file, opts) end if opts.when_changed then - local is_new = not Config.json.data.news[ref] + local is_new = not LazyVim.config.json.data.news[ref] local hash = M.hash(file) - if hash == Config.json.data.news[ref] then + if hash == LazyVim.config.json.data.news[ref] then return end - Config.json.data.news[ref] = hash + LazyVim.config.json.data.news[ref] = hash LazyVim.json.save() -- don't open if file has never been opened if is_new then diff --git a/lua/lazyvim/util/ui.lua b/lua/lazyvim/util/ui.lua index 84ab8ab5..1ad2b6f0 100644 --- a/lua/lazyvim/util/ui.lua +++ b/lua/lazyvim/util/ui.lua @@ -78,7 +78,7 @@ function M.foldtext() if not ret or type(ret) == "string" then ret = { { vim.api.nvim_buf_get_lines(0, vim.v.lnum - 1, vim.v.lnum, false)[1], {} } } end - table.insert(ret, { " " .. require("lazyvim.config").icons.misc.dots }) + table.insert(ret, { " " .. LazyVim.config.icons.misc.dots }) if not vim.treesitter.foldtext then return table.concat(