summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lua/lvim/core/alpha.lua1
-rw-r--r--lua/lvim/core/alpha/dashboard.lua15
-rw-r--r--lua/lvim/core/autocmds.lua2
-rw-r--r--lua/lvim/core/autopairs.lua1
-rw-r--r--lua/lvim/core/breadcrumbs.lua1
-rw-r--r--lua/lvim/core/bufferline.lua1
-rw-r--r--lua/lvim/core/builtins/init.lua6
-rw-r--r--lua/lvim/core/cmp.lua1
-rw-r--r--lua/lvim/core/comment.lua1
-rw-r--r--lua/lvim/core/dap.lua1
-rw-r--r--lua/lvim/core/gitsigns.lua1
-rw-r--r--lua/lvim/core/illuminate.lua1
-rw-r--r--lua/lvim/core/indentlines.lua1
-rw-r--r--lua/lvim/core/lir.lua1
-rw-r--r--lua/lvim/core/lualine/init.lua1
-rw-r--r--lua/lvim/core/mason.lua1
-rw-r--r--lua/lvim/core/nvimtree.lua1
-rw-r--r--lua/lvim/core/project.lua1
-rw-r--r--lua/lvim/core/telescope.lua1
-rw-r--r--lua/lvim/core/terminal.lua1
-rw-r--r--lua/lvim/core/treesitter.lua1
-rw-r--r--lua/lvim/core/which-key.lua1
22 files changed, 34 insertions, 8 deletions
diff --git a/lua/lvim/core/alpha.lua b/lua/lvim/core/alpha.lua
index 81bff949..3150152c 100644
--- a/lua/lvim/core/alpha.lua
+++ b/lua/lvim/core/alpha.lua
@@ -15,6 +15,7 @@ function M.config()
mode = "dashboard",
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.alpha = config
end
diff --git a/lua/lvim/core/alpha/dashboard.lua b/lua/lvim/core/alpha/dashboard.lua
index 65195c7c..86d0fed8 100644
--- a/lua/lvim/core/alpha/dashboard.lua
+++ b/lua/lvim/core/alpha/dashboard.lua
@@ -104,15 +104,18 @@ function M.get_sections()
}
local text = require "lvim.interface.text"
- local lvim_version = require("lvim.utils.git").get_lvim_version()
local footer = {
type = "text",
- val = text.align_center({ width = 0 }, {
- "",
- "lunarvim.org",
- lvim_version,
- }, 0.5),
+ val = function()
+ local lvim_version = require("lvim.utils.git").get_lvim_version()
+ return text.align_center({ width = 0 }, {
+ "",
+ "lunarvim.org",
+ lvim_version,
+ }, 0.5)
+ end,
+
opts = {
position = "center",
hl = "Number",
diff --git a/lua/lvim/core/autocmds.lua b/lua/lvim/core/autocmds.lua
index bb080ced..f980a27f 100644
--- a/lua/lvim/core/autocmds.lua
+++ b/lua/lvim/core/autocmds.lua
@@ -104,7 +104,7 @@ function M.load_defaults()
{
group = "_lvim_colorscheme",
callback = function()
- if lvim.builtin.breadcrumbs.active then
+ if package.loaded["nvim-navic"] and lvim.builtin.breadcrumbs.active then
require("lvim.core.breadcrumbs").get_winbar()
end
local statusline_hl = vim.api.nvim_get_hl_by_name("StatusLine", true)
diff --git a/lua/lvim/core/autopairs.lua b/lua/lvim/core/autopairs.lua
index 76032eb7..3dfb47ee 100644
--- a/lua/lvim/core/autopairs.lua
+++ b/lua/lvim/core/autopairs.lua
@@ -43,6 +43,7 @@ function M.config()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.autopairs = config
end
diff --git a/lua/lvim/core/breadcrumbs.lua b/lua/lvim/core/breadcrumbs.lua
index fe80cd95..e4e6d8d8 100644
--- a/lua/lvim/core/breadcrumbs.lua
+++ b/lua/lvim/core/breadcrumbs.lua
@@ -76,6 +76,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.breadcrumbs = config
end
diff --git a/lua/lvim/core/bufferline.lua b/lua/lvim/core/bufferline.lua
index a65bc632..1ecdffba 100644
--- a/lua/lvim/core/bufferline.lua
+++ b/lua/lvim/core/bufferline.lua
@@ -141,6 +141,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.bufferline = config
end
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index e918b033..3373c60f 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -28,9 +28,13 @@ local builtins = {
"mason",
}
+function M.defaults()
+ return { active = true }
+end
+
function M.init()
for _, name in ipairs(builtins) do
- lvim.builtin[name] = { active = true }
+ lvim.builtin[name] = M.defaults()
end
reload("lvim.core.theme").config()
diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua
index 2360947f..b62433dc 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
@@ -353,6 +353,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.cmp = config
end
diff --git a/lua/lvim/core/comment.lua b/lua/lvim/core/comment.lua
index c75d402c..811ffdac 100644
--- a/lua/lvim/core/comment.lua
+++ b/lua/lvim/core/comment.lua
@@ -71,6 +71,7 @@ function M.config()
post_hook = nil,
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.comment = config
end
diff --git a/lua/lvim/core/dap.lua b/lua/lvim/core/dap.lua
index 029d1d98..afadab1d 100644
--- a/lua/lvim/core/dap.lua
+++ b/lua/lvim/core/dap.lua
@@ -94,6 +94,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.dap = config
end
diff --git a/lua/lvim/core/gitsigns.lua b/lua/lvim/core/gitsigns.lua
index 1cf6e4ac..7f425542 100644
--- a/lua/lvim/core/gitsigns.lua
+++ b/lua/lvim/core/gitsigns.lua
@@ -68,6 +68,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.gitsigns = config
end
diff --git a/lua/lvim/core/illuminate.lua b/lua/lvim/core/illuminate.lua
index 3c14ecab..8ab606e4 100644
--- a/lua/lvim/core/illuminate.lua
+++ b/lua/lvim/core/illuminate.lua
@@ -50,6 +50,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.illuminate = config
end
diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua
index d0716a4c..66555b23 100644
--- a/lua/lvim/core/indentlines.lua
+++ b/lua/lvim/core/indentlines.lua
@@ -24,6 +24,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.indentlines = config
end
diff --git a/lua/lvim/core/lir.lua b/lua/lvim/core/lir.lua
index eca156a7..4a3b2c09 100644
--- a/lua/lvim/core/lir.lua
+++ b/lua/lvim/core/lir.lua
@@ -71,6 +71,7 @@ M.config = function()
end,
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.lir = config
end
diff --git a/lua/lvim/core/lualine/init.lua b/lua/lvim/core/lualine/init.lua
index bb530258..350436ec 100644
--- a/lua/lvim/core/lualine/init.lua
+++ b/lua/lvim/core/lualine/init.lua
@@ -32,6 +32,7 @@ M.config = function()
extensions = nil,
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.lualine = config
end
diff --git a/lua/lvim/core/mason.lua b/lua/lvim/core/mason.lua
index 51271045..68201549 100644
--- a/lua/lvim/core/mason.lua
+++ b/lua/lvim/core/mason.lua
@@ -51,6 +51,7 @@ function M.config()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.mason = config
end
diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua
index d3c7a2de..4b8033c0 100644
--- a/lua/lvim/core/nvimtree.lua
+++ b/lua/lvim/core/nvimtree.lua
@@ -231,6 +231,7 @@ function M.config()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.nvimtree = config
end
diff --git a/lua/lvim/core/project.lua b/lua/lvim/core/project.lua
index f2da6c33..71aed54b 100644
--- a/lua/lvim/core/project.lua
+++ b/lua/lvim/core/project.lua
@@ -45,6 +45,7 @@ function M.config()
datapath = get_cache_dir(),
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.project = config
end
diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua
index c1b4e2ec..ecb0c3bc 100644
--- a/lua/lvim/core/telescope.lua
+++ b/lua/lvim/core/telescope.lua
@@ -105,6 +105,7 @@ function M.config()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.telescope = config
end
diff --git a/lua/lvim/core/terminal.lua b/lua/lvim/core/terminal.lua
index 0635b4a9..e7b57387 100644
--- a/lua/lvim/core/terminal.lua
+++ b/lua/lvim/core/terminal.lua
@@ -45,6 +45,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.terminal = config
end
diff --git a/lua/lvim/core/treesitter.lua b/lua/lvim/core/treesitter.lua
index e44a39c7..9371b89c 100644
--- a/lua/lvim/core/treesitter.lua
+++ b/lua/lvim/core/treesitter.lua
@@ -92,6 +92,7 @@ function M.config()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.treesitter = config
end
diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index cfff800c..b6ef4873 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -296,6 +296,7 @@ M.config = function()
},
}
---@cast config +LvimBuiltin
+ config = vim.tbl_extend("keep", config, require("lvim.core.builtins").defaults())
lvim.builtin.which_key = config
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 20:44:29 +0000