Merge branch 'rolling' of github.com:ChristianChiarulli/LunarVim into rolling

1 files changed, 7 insertions, 2 deletions

diff --git a/init.lua b/init.lua
index c8088523..6a09c909 100644
--- a/init.lua
+++ b/init.lua
@@ -1,12 +1,17 @@
 require "default-config"
-require "keymappings"
 local status_ok, error = pcall(vim.cmd, "luafile " .. CONFIG_PATH .. "/lv-config.lua")
 if not status_ok then
   print "something is wrong with your lv-config"
   print(error)
 end
-require "plugins"
+
+require "keymappings"
+
+local plugins = require "plugins"
+local plugin_loader = require("plugin-loader").init()
+plugin_loader:load { plugins, O.user_plugins }
 vim.g.colors_name = O.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs.
+
 require "settings"
 require "lv-utils"