4 files changed, 8 insertions, 7 deletions
diff --git a/lua/lvim/bootstrap.lua b/lua/lvim/bootstrap.lua
index ac6475c7..a3114a1e 100644
--- a/lua/lvim/bootstrap.lua
+++ b/lua/lvim/bootstrap.lua
@@ -70,14 +70,11 @@ function M:init(base_dir)
   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")
 
-  ---@meta overridden to use LUNARVIM_x_DIR instead, since a lot of plugins call this function interally
+  ---@meta overridden to use LUNARVIM_CACHE_DIR instead, since a lot of plugins call this function interally
+  ---NOTE: changes to "data" are currently unstable, see #2507
   vim.fn.stdpath = function(what)
     if what == "cache" then
       return _G.get_cache_dir()
-    elseif what == "data" then
-      return _G.get_runtime_dir()
-    elseif what == "config" then
-      return _G.get_config_dir()
     end
     return vim.call("stdpath", what)
   end
diff --git a/lua/lvim/impatient/profile.lua b/lua/lvim/impatient/profile.lua
index 3676c298..0ab04d65 100644
--- a/lua/lvim/impatient/profile.lua
+++ b/lua/lvim/impatient/profile.lua
@@ -5,6 +5,8 @@ local api, uv = vim.api, vim.loop
 local std_data = vim.fn.stdpath "data"
 local std_config = vim.fn.stdpath "config"
 local vimruntime = os.getenv "VIMRUNTIME"
+local lvim_runtime = get_runtime_dir()
+local lvim_config = get_config_dir()
 
 local function load_buffer(title, lines)
   local bufnr = api.nvim_create_buf(false, false)
@@ -25,6 +27,8 @@ local function mod_path(path)
   path = path:gsub(std_data .. "/", "<STD_DATA>/")
   path = path:gsub(std_config .. "/", "<STD_CONFIG>/")
   path = path:gsub(vimruntime .. "/", "<VIMRUNTIME>/")
+  path = path:gsub(lvim_runtime .. "/", "<LVIM_RUNTIME>/")
+  path = path:gsub(lvim_config .. "/", "<LVIM_CONFIG>/")
   return path
 end
 
diff --git a/lua/lvim/lsp/null-ls/init.lua b/lua/lvim/lsp/null-ls/init.lua
index 68e20c98..51a200f4 100644
--- a/lua/lvim/lsp/null-ls/init.lua
+++ b/lua/lvim/lsp/null-ls/init.lua
@@ -2,7 +2,7 @@ local M = {}
 
 local Log = require "lvim.core.log"
 
-function M:setup()
+function M.setup()
   local status_ok, null_ls = pcall(require, "null-ls")
   if not status_ok then
     Log:error "Missing null-ls dependency"
diff --git a/lua/lvim/lsp/templates.lua b/lua/lvim/lsp/templates.lua
index 38e68fb6..09f82430 100644
--- a/lua/lvim/lsp/templates.lua
+++ b/lua/lvim/lsp/templates.lua
@@ -46,7 +46,7 @@ end
 
 ---Generates ftplugin files based on a list of server_names
 ---The files are generated to a runtimepath: "$LUNARVIM_RUNTIME_DIR/site/after/ftplugin/template.lua"
----@param servers_names table list of servers to be enabled. Will add all by default
+---@param servers_names? table list of servers to be enabled. Will add all by default
 function M.generate_templates(servers_names)
   servers_names = servers_names or {}