summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLostNeophyte <[email protected]>2023-02-11 13:18:55 +0100
committerLostNeophyte <[email protected]>2023-02-11 13:18:55 +0100
commited5b43bba06e6d1ef7b6bd7ed95c55b64e2df3c8 (patch)
tree3ebb66ea16ebc71bf88c6685acf9b8400ccb9203
parent19936f578ae1a2d4f4af812a41475a49c5862349 (diff)
refactor: renaming
-rw-r--r--lua/lvim/config/init.lua2
-rw-r--r--lua/lvim/core/builtins/init.lua6
-rw-r--r--lua/lvim/plugins.lua38
3 files changed, 23 insertions, 23 deletions
diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua
index 9f4bb45e..80cef387 100644
--- a/lua/lvim/config/init.lua
+++ b/lua/lvim/config/init.lua
@@ -18,7 +18,7 @@ function M:init()
require("lvim.keymappings").load_defaults()
local builtins = require "lvim.core.builtins"
- builtins.config { user_config_file = user_config_file }
+ builtins.init { user_config_file = user_config_file }
local settings = require "lvim.config.settings"
settings.load_defaults()
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index d36c3bee..51b47b36 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -27,7 +27,7 @@ local builtins = {
---@field active boolean is builtin enabled
---@field on_config_done function function called after the builtin is set up
-function M.config(config)
+function M.init(config)
---@type {[string]: LvimBuiltin}
lvim.builtin = {}
@@ -38,10 +38,10 @@ function M.config(config)
end
end
-function M.setup_builtin(modname)
+function M.setup(modname)
local plugin = require("lvim.core." .. modname).setup()
- local builtin_tbl = lvim.builtin[string.gsub(modname, "-", "_")]
+ local builtin_tbl = lvim.builtin[modname:gsub("-", "_")]
if type(builtin_tbl.on_config_done) == "function" then
builtin_tbl.on_config_done(plugin)
end
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 087ed7a3..b7976c5a 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -17,7 +17,7 @@ local core_plugins = {
{
"williamboman/mason.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "mason"
+ require("lvim.core.builtins").setup "mason"
end,
cmd = { "Mason", "MasonInstall", "MasonUninstall", "MasonUninstallAll", "MasonLog" },
lazy = true,
@@ -39,7 +39,7 @@ local core_plugins = {
"nvim-telescope/telescope.nvim",
branch = "0.1.x",
config = function()
- require("lvim.core.builtins").setup_builtin "telescope"
+ require("lvim.core.builtins").setup "telescope"
end,
dependencies = { "telescope-fzf-native.nvim" },
lazy = true,
@@ -51,7 +51,7 @@ local core_plugins = {
{
"hrsh7th/nvim-cmp",
config = function()
- require("lvim.core.builtins").setup_builtin "cmp"
+ require("lvim.core.builtins").setup "cmp"
end,
event = { "InsertEnter", "CmdlineEnter" },
dependencies = {
@@ -105,7 +105,7 @@ local core_plugins = {
"windwp/nvim-autopairs",
event = "InsertEnter",
config = function()
- require("lvim.core.builtins").setup_builtin "autopairs"
+ require("lvim.core.builtins").setup "autopairs"
end,
enabled = lvim.builtin.autopairs.active,
},
@@ -118,7 +118,7 @@ local core_plugins = {
local utils = require "lvim.utils"
local path = utils.join_paths(get_runtime_dir(), "site", "pack", "lazy", "opt", "nvim-treesitter")
vim.opt.rtp:prepend(path) -- treesitter needs to be before nvim's runtime in rtp
- require("lvim.core.builtins").setup_builtin "treesitter"
+ require("lvim.core.builtins").setup "treesitter"
end,
cmd = { "TSInstall", "TSUninstall", "TSUpdate", "TSInstallInfo", "TSInstallSync", "TSInstallFromGrammar" },
event = "User FileOpened",
@@ -133,7 +133,7 @@ local core_plugins = {
{
"kyazdani42/nvim-tree.lua",
config = function()
- require("lvim.core.builtins").setup_builtin "nvimtree"
+ require("lvim.core.builtins").setup "nvimtree"
end,
enabled = lvim.builtin.nvimtree.active,
cmd = { "NvimTreeToggle", "NvimTreeOpen", "NvimTreeFocus", "NvimTreeFindFileToggle" },
@@ -143,7 +143,7 @@ local core_plugins = {
{
"tamago324/lir.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "lir"
+ require("lvim.core.builtins").setup "lir"
end,
enabled = lvim.builtin.lir.active,
event = "User DirOpened",
@@ -151,7 +151,7 @@ local core_plugins = {
{
"lewis6991/gitsigns.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "gitsigns"
+ require("lvim.core.builtins").setup "gitsigns"
end,
event = "User FileOpened",
cmd = "Gitsigns",
@@ -162,7 +162,7 @@ local core_plugins = {
{
"folke/which-key.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "which-key"
+ require("lvim.core.builtins").setup "which-key"
end,
cmd = "WhichKey",
event = "VeryLazy",
@@ -173,7 +173,7 @@ local core_plugins = {
{
"numToStr/Comment.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "comment"
+ require("lvim.core.builtins").setup "comment"
end,
keys = { { "gc", mode = { "n", "v" } }, { "gb", mode = { "n", "v" } } },
event = "User FileOpened",
@@ -184,7 +184,7 @@ local core_plugins = {
{
"ahmedkhalf/project.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "project"
+ require("lvim.core.builtins").setup "project"
end,
enabled = lvim.builtin.project.active,
event = "VimEnter",
@@ -204,7 +204,7 @@ local core_plugins = {
"nvim-lualine/lualine.nvim",
-- "Lunarvim/lualine.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "lualine"
+ require("lvim.core.builtins").setup "lualine"
end,
event = "VimEnter",
enabled = lvim.builtin.lualine.active,
@@ -214,7 +214,7 @@ local core_plugins = {
{
"SmiteshP/nvim-navic",
config = function()
- require("lvim.core.builtins").setup_builtin "breadcrumbs"
+ require("lvim.core.builtins").setup "breadcrumbs"
end,
event = "User FileOpened",
enabled = lvim.builtin.breadcrumbs.active,
@@ -223,7 +223,7 @@ local core_plugins = {
{
"akinsho/bufferline.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "bufferline"
+ require("lvim.core.builtins").setup "bufferline"
end,
branch = "main",
event = "User FileOpened",
@@ -234,7 +234,7 @@ local core_plugins = {
{
"mfussenegger/nvim-dap",
config = function()
- require("lvim.core.builtins").setup_builtin "dap"
+ require("lvim.core.builtins").setup "dap"
end,
lazy = true,
enabled = lvim.builtin.dap.active,
@@ -254,7 +254,7 @@ local core_plugins = {
{
"goolord/alpha-nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "alpha"
+ require("lvim.core.builtins").setup "alpha"
end,
enabled = lvim.builtin.alpha.active,
event = "VimEnter",
@@ -266,7 +266,7 @@ local core_plugins = {
event = "VeryLazy",
branch = "main",
config = function()
- require("lvim.core.builtins").setup_builtin "terminal"
+ require("lvim.core.builtins").setup "terminal"
end,
enabled = lvim.builtin.terminal.active,
},
@@ -280,7 +280,7 @@ local core_plugins = {
{
"RRethy/vim-illuminate",
config = function()
- require("lvim.core.builtins").setup_builtin "illuminate"
+ require("lvim.core.builtins").setup "illuminate"
end,
event = "User FileOpened",
enabled = lvim.builtin.illuminate.active,
@@ -289,7 +289,7 @@ local core_plugins = {
{
"lukas-reineke/indent-blankline.nvim",
config = function()
- require("lvim.core.builtins").setup_builtin "indentlines"
+ require("lvim.core.builtins").setup "indentlines"
end,
event = "User FileOpened",
enabled = lvim.builtin.indentlines.active,