Merge remote-tracking branch 'origin/rolling'

1 files changed, 8 insertions, 2 deletions

diff --git a/init.lua b/init.lua
index cd7c6598..75452843 100644
--- a/init.lua
+++ b/init.lua
@@ -1,5 +1,8 @@
-local init_path = debug.getinfo(1, "S").source:sub(2)
-local base_dir = init_path:match("(.*[/\\])"):sub(1, -2)
+local base_dir = vim.env.LUNARVIM_BASE_DIR
+  or (function()
+    local init_path = debug.getinfo(1, "S").source
+    return init_path:sub(2):match("(.*[/\\])"):sub(1, -2)
+  end)()
 
 if not vim.tbl_contains(vim.opt.rtp:get(), base_dir) then
   vim.opt.rtp:append(base_dir)
@@ -10,8 +13,11 @@ require("lvim.bootstrap"):init(base_dir)
 require("lvim.config"):load()
 
 local plugins = require "lvim.plugins"
+
 require("lvim.plugin-loader").load { plugins, lvim.plugins }
 
+require("lvim.core.theme").setup()
+
 local Log = require "lvim.core.log"
 Log:debug "Starting LunarVim"