From ffcaae6c32fb10c7716dde2593e30bdf044719db Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 15 Nov 2021 09:20:45 +0100 Subject: fix: use an indepdent shadafile from neovim (#1910) --- lua/lvim/bootstrap.lua | 4 ++-- lua/lvim/config/settings.lua | 2 ++ lua/lvim/core/log.lua | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/lvim/bootstrap.lua b/lua/lvim/bootstrap.lua index 74a9bf45..051f7698 100644 --- a/lua/lvim/bootstrap.lua +++ b/lua/lvim/bootstrap.lua @@ -46,7 +46,7 @@ end function M:init(base_dir) self.runtime_dir = get_runtime_dir() self.config_dir = get_config_dir() - self.cache_path = get_cache_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") @@ -80,7 +80,7 @@ function M:init(base_dir) if not os.getenv "LVIM_TEST_ENV" then _G.PLENARY_DEBUG = false require("lvim.impatient").setup { - path = vim.fn.stdpath "cache" .. "/lvim_cache", + path = join_paths(self.cache_dir, "lvim_cache"), enable_profiling = true, } end diff --git a/lua/lvim/config/settings.lua b/lua/lvim/config/settings.lua index 8db43904..048d4058 100644 --- a/lua/lvim/config/settings.lua +++ b/lua/lvim/config/settings.lua @@ -51,6 +51,8 @@ M.load_options = function() vim.opt.shortmess:append "c" + vim.opt.shadafile = utils.join_paths(get_cache_dir(), "lvim.shada") + for k, v in pairs(default_options) do vim.opt[k] = v end diff --git a/lua/lvim/core/log.lua b/lua/lvim/core/log.lua index 9950af28..f51b8af6 100644 --- a/lua/lvim/core/log.lua +++ b/lua/lvim/core/log.lua @@ -1,6 +1,6 @@ local Log = {} -local logfile = string.format("%s/%s.log", vim.fn.stdpath "cache", "lvim") +local logfile = string.format("%s/%s.log", get_cache_dir(), "lvim") Log.levels = { TRACE = 1, -- cgit v1.2.3