Merge remote-tracking branch 'origin/rolling'

1 files changed, 13 insertions, 13 deletions

diff --git a/init.lua b/init.lua
index c4fa5d35..9bc5c9ee 100644
--- a/init.lua
+++ b/init.lua
@@ -1,26 +1,26 @@
-if os.getenv "LUNARVIM_RUNTIME_DIR" then
-  local path_sep = vim.loop.os_uname().version:match "Windows" and "\\" or "/"
-  vim.opt.rtp:append(os.getenv "LUNARVIM_RUNTIME_DIR" .. path_sep .. "lvim")
+local init_path = debug.getinfo(1, "S").source:sub(2)
+local base_dir = init_path:match("(.*[/\\])"):sub(1, -2)
+
+if not vim.tbl_contains(vim.opt.rtp:get(), base_dir) then
+  vim.opt.rtp:append(base_dir)
 end
 
-require("bootstrap"):init()
+require("lvim.bootstrap"):init(base_dir)
 
-local config = require "config"
--- config:init()
-config:load()
+require("lvim.config"):load()
 
-local plugins = require "plugins"
-require("plugin-loader"):load { plugins, lvim.plugins }
+local plugins = require "lvim.plugins"
+require("lvim.plugin-loader"):load { plugins, lvim.plugins }
 
-local Log = require "core.log"
+local Log = require "lvim.core.log"
 Log:debug "Starting LunarVim"
 
 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 commands = require "core.commands"
+local commands = require "lvim.core.commands"
 commands.load(commands.defaults)
 
-require("keymappings").setup()
+require("lvim.keymappings").setup()
 
-require("lsp").setup()
+require("lvim.lsp").setup()