diff options
Diffstat (limited to 'lua/lvim/bootstrap.lua')
| -rw-r--r-- | lua/lvim/bootstrap.lua | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/lua/lvim/bootstrap.lua b/lua/lvim/bootstrap.lua index 5385e8a8..a2a97cea 100644 --- a/lua/lvim/bootstrap.lua +++ b/lua/lvim/bootstrap.lua @@ -3,6 +3,7 @@ local M = {} if vim.fn.has "nvim-0.8" ~= 1 then vim.notify("Please upgrade your Neovim base installation. Lunarvim requires v0.8+", vim.log.levels.WARN) vim.wait(5000, function() + ---@diagnostic disable-next-line: redundant-return-value return false end) vim.cmd "cquit" @@ -23,7 +24,7 @@ _G.require_safe = require("lvim.utils.modules").require_safe _G.reload = require("lvim.utils.modules").reload ---Get the full path to `$LUNARVIM_RUNTIME_DIR` ----@return string +---@return string|nil function _G.get_runtime_dir() local lvim_runtime_dir = os.getenv "LUNARVIM_RUNTIME_DIR" if not lvim_runtime_dir then @@ -34,7 +35,7 @@ function _G.get_runtime_dir() end ---Get the full path to `$LUNARVIM_CONFIG_DIR` ----@return string +---@return string|nil function _G.get_config_dir() local lvim_config_dir = os.getenv "LUNARVIM_CONFIG_DIR" if not lvim_config_dir then @@ -44,7 +45,7 @@ function _G.get_config_dir() end ---Get the full path to `$LUNARVIM_CACHE_DIR` ----@return string +---@return string|nil function _G.get_cache_dir() local lvim_cache_dir = os.getenv "LUNARVIM_CACHE_DIR" if not lvim_cache_dir then @@ -60,11 +61,11 @@ function M:init(base_dir) self.config_dir = get_config_dir() self.cache_dir = get_cache_dir() self.pack_dir = join_paths(self.runtime_dir, "site", "pack") - self.packer_install_dir = join_paths(self.runtime_dir, "site", "pack", "packer", "start", "packer.nvim") - self.packer_cache_path = join_paths(self.config_dir, "plugin", "packer_compiled.lua") + self.lazy_install_dir = join_paths(self.pack_dir, "lazy", "opt", "lazy.nvim") ---@meta overridden to use LUNARVIM_CACHE_DIR instead, since a lot of plugins call this function internally ---NOTE: changes to "data" are currently unstable, see #2507 + ---@diagnostic disable-next-line: duplicate-set-field vim.fn.stdpath = function(what) if what == "cache" then return _G.get_cache_dir() @@ -79,10 +80,9 @@ function M:init(base_dir) end if os.getenv "LUNARVIM_RUNTIME_DIR" then - -- vim.opt.rtp:append(os.getenv "LUNARVIM_RUNTIME_DIR" .. path_sep .. "lvim") vim.opt.rtp:remove(join_paths(vim.call("stdpath", "data"), "site")) vim.opt.rtp:remove(join_paths(vim.call("stdpath", "data"), "site", "after")) - vim.opt.rtp:prepend(join_paths(self.runtime_dir, "site")) + -- vim.opt.rtp:prepend(join_paths(self.runtime_dir, "site")) vim.opt.rtp:append(join_paths(self.runtime_dir, "lvim", "after")) vim.opt.rtp:append(join_paths(self.runtime_dir, "site", "after")) @@ -90,22 +90,17 @@ function M:init(base_dir) vim.opt.rtp:remove(join_paths(vim.call("stdpath", "config"), "after")) vim.opt.rtp:prepend(self.config_dir) vim.opt.rtp:append(join_paths(self.config_dir, "after")) - -- TODO: we need something like this: vim.opt.packpath = vim.opt.rtp - - vim.cmd [[let &packpath = &runtimepath]] - end - if not vim.env.LVIM_TEST_ENV then - require "lvim.impatient" + vim.opt.packpath = vim.opt.rtp:get() end - require("lvim.config"):init() - require("lvim.plugin-loader").init { package_root = self.pack_dir, - install_path = self.packer_install_dir, + install_path = self.lazy_install_dir, } + require("lvim.config"):init() + require("lvim.core.mason").bootstrap() return self |