summaryrefslogtreecommitdiff
path: root/lua/lvim/config
diff options
context:
space:
mode:
authorkylo252 <[email protected]>2022-10-04 19:23:52 +0200
committerGitHub <[email protected]>2022-10-04 13:23:52 -0400
commite5bcf01c759e7c833d8a5f1fcf665b6ea32a7c16 (patch)
tree51b68c8face9faa2a41fcc8103b6296213557d4b /lua/lvim/config
parent560ee4d7cf4038a22a5556d79ad92cd226a792dc (diff)
refactor: more deliberate reload (#3133)
Diffstat (limited to 'lua/lvim/config')
-rw-r--r--lua/lvim/config/init.lua15
1 files changed, 8 insertions, 7 deletions
diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua
index c6765f56..483af50d 100644
--- a/lua/lvim/config/init.lua
+++ b/lua/lvim/config/init.lua
@@ -111,7 +111,7 @@ end
--- Override the configuration with a user provided one
-- @param config_path The path to the configuration overrides
function M:load(config_path)
- local autocmds = require "lvim.core.autocmds"
+ local autocmds = reload "lvim.core.autocmds"
config_path = config_path or self:get_user_config_path()
local ok, err = pcall(dofile, config_path)
if not ok then
@@ -128,7 +128,7 @@ function M:load(config_path)
vim.g.mapleader = (lvim.leader == "space" and " ") or lvim.leader
- require("lvim.keymappings").load(lvim.keys)
+ reload("lvim.keymappings").load(lvim.keys)
if lvim.transparent_window then
autocmds.enable_transparent_mode()
@@ -139,17 +139,18 @@ end
-- @param config_path The path to the configuration overrides
function M:reload()
vim.schedule(function()
- require_clean("lvim.utils.hooks").run_pre_reload()
+ reload("lvim.utils.hooks").run_pre_reload()
M:load()
- require("lvim.core.autocmds").configure_format_on_save()
+ reload("lvim.core.autocmds").configure_format_on_save()
- local plugins = require "lvim.plugins"
- local plugin_loader = require "lvim.plugin-loader"
+ local plugins = reload "lvim.plugins"
+ local plugin_loader = reload "lvim.plugin-loader"
plugin_loader.reload { plugins, lvim.plugins }
- require_clean("lvim.utils.hooks").run_post_reload()
+ reload("lvim.core.theme").setup()
+ reload("lvim.utils.hooks").run_post_reload()
end)
end