1 files changed, 49 insertions, 9 deletions
diff --git a/init.lua b/init.lua
index 680555f2..fd277510 100644
--- a/init.lua
+++ b/init.lua
@@ -1,18 +1,58 @@
+vim.cmd [[
+  set packpath-=~/.config/nvim
+  set packpath-=~/.config/nvim/after
+  set packpath-=~/.local/share/nvim/site
+  set packpath^=~/.local/share/lunarvim/site
+  set packpath^=~/.config/lvim
+
+  set runtimepath-=~/.config/nvim
+  set runtimepath-=~/.config/nvim/after
+  set runtimepath+=~/.config/lvim
+  set runtimepath^=~/.local/share/lunarvim/lvim/after
+]]
+-- vim.opt.rtp:append() instead of vim.cmd ?
 require "default-config"
-require "keymappings"
-local status_ok, _ = pcall(vim.cmd, "luafile " .. CONFIG_PATH .. "/lv-config.lua")
+require("settings").load_options()
+local status_ok, error = pcall(vim.cmd, "luafile ~/.config/lvim/lv-config.lua")
 if not status_ok then
   print "something is wrong with your lv-config"
+  print(error)
+end
+require("settings").load_commands()
+require("core.autocmds").define_augroups(lvim.autocommands)
+
+require "keymappings"
+require("lsp").setup_default_bindings()
+
+local plugins = require "plugins"
+local plugin_loader = require("plugin-loader").init()
+plugin_loader:load { plugins, lvim.plugins }
+vim.g.colors_name = lvim.colorscheme -- Colorscheme must get called after plugins are loaded or it will break new installs.
+vim.cmd("colorscheme " .. lvim.colorscheme)
+
+local utils = require "utils"
+utils.toggle_autoformat()
+local commands = require "core.commands"
+commands.load(commands.defaults)
+
+require("lsp").setup_handlers()
+
+local null_status_ok, null_ls = pcall(require, "null-ls")
+if null_status_ok then
+  null_ls.config {}
+  require("lspconfig")["null-ls"].setup {}
+end
+
+local lsp_settings_status_ok, lsp_settings = pcall(require, "nlspsettings")
+if lsp_settings_status_ok then
+  lsp_settings.setup {
+    config_home = os.getenv "HOME" .. "/.config/lvim/lsp-settings",
+  }
 end
-require "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"
 
 -- TODO: these guys need to be in language files
--- require "lsp"
--- if O.lang.emmet.active then
+-- if lvim.lang.emmet.active then
 --   require "lsp.emmet-ls"
 -- end
--- if O.lang.tailwindcss.active then
+-- if lvim.lang.tailwindcss.active then
 --   require "lsp.tailwind