summaryrefslogtreecommitdiff
path: root/lua/utils/init.lua
diff options
context:
space:
mode:
authorLuc Sinet <[email protected]>2021-08-25 07:47:48 +0200
committerGitHub <[email protected]>2021-08-25 07:47:48 +0200
commit00b895d9e9577f084cf577a07f9d6d6e1f7a4cac (patch)
tree1139617d5b3acd56f221f24ce301f51535267bdc /lua/utils/init.lua
parentf6c706ac0c346491cc79bdea46a52ee7a8694e0d (diff)
[Feature] Encapsulate config logic (#1338)
* Define core/builtins, streamline status_color interface * Encapsulate configuration in its own module * Add fallback to lv-config.lua * Rectify settings loading order to allow overriding vim options * Move default-config into config/ module * replace uv.fs_stat with utils.is_file
Diffstat (limited to 'lua/utils/init.lua')
-rw-r--r--lua/utils/init.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/lua/utils/init.lua b/lua/utils/init.lua
index 446a1509..80a2dbe6 100644
--- a/lua/utils/init.lua
+++ b/lua/utils/init.lua
@@ -89,8 +89,10 @@ end
function utils.reload_lv_config()
require("core.lualine").config()
- vim.cmd "source ~/.local/share/lunarvim/lvim/lua/settings.lua"
- vim.cmd("source " .. USER_CONFIG_PATH)
+
+ local config = require "config"
+ config:load()
+
require("keymappings").setup() -- this should be done before loading the plugins
vim.cmd "source ~/.local/share/lunarvim/lvim/lua/plugins.lua"
local plugins = require "plugins"