3 files changed, 17 insertions, 14 deletions
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 7128a4cc..7f4b3bd5 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -1,10 +1,12 @@
 local skipped_servers = {
   "angularls",
   "ansiblels",
+  "antlersls",
   "ccls",
   "csharp_ls",
   "cssmodules_ls",
   "denols",
+  "docker_compose_language_service",
   "ember",
   "emmet_ls",
   "eslint",
diff --git a/lua/lvim/lsp/providers/sumneko_lua.lua b/lua/lvim/lsp/providers/lua_ls.lua
index a73d3edc..2d3f4932 100644
--- a/lua/lvim/lsp/providers/sumneko_lua.lua
+++ b/lua/lvim/lsp/providers/lua_ls.lua
@@ -30,7 +30,7 @@ local make_on_new_config = function(on_new_config, _)
   return lspconfig.util.add_hook_before(on_new_config, function(new_config, _)
     local server_name = new_config.name
 
-    if server_name ~= "sumneko_lua" then
+    if server_name ~= "lua_ls" then
       return
     end
     local plugins = { "plenary.nvim", "telescope.nvim", "nvim-treesitter", "LuaSnip" }
diff --git a/lua/lvim/plugin-loader.lua b/lua/lvim/plugin-loader.lua
index 647fab9f..5a3a94de 100644
--- a/lua/lvim/plugin-loader.lua
+++ b/lua/lvim/plugin-loader.lua
@@ -17,7 +17,7 @@ function plugin_loader.init(opts)
     local core_plugins_dir = join_paths(get_lvim_base_dir(), "plugins")
     if utils.is_directory(core_plugins_dir) then
       vim.fn.mkdir(plugins_dir, "p")
-      vim.loop.fs_rmdir(plugins_dir)
+      vim.fn.delete(plugins_dir, "rf")
       require("lvim.utils").fs_copy(core_plugins_dir, plugins_dir)
     else
       vim.fn.system {
@@ -47,21 +47,22 @@ function plugin_loader.init(opts)
   vim.opt.runtimepath:append(lazy_install_dir)
   vim.opt.runtimepath:append(join_paths(plugins_dir, "*"))
 
-  local lazy_cache = require "lazy.core.cache"
-  lazy_cache.setup {
-    performance = {
-      cache = {
-        enabled = true,
-        path = join_paths(get_cache_dir(), "lazy", "cache"),
-      },
-    },
-  }
-  -- HACK: Don't allow lazy to call setup second time
-  lazy_cache.setup = function() end
+  pcall(function()
+    -- set a custom path for lazy's cache and enable it
+    local lazy_cache = require "lazy.core.cache"
+    lazy_cache.path = join_paths(get_cache_dir(), "lazy", "luac")
+    lazy_cache.enable()
+  end)
 end
 
 function plugin_loader.reset_cache()
-  os.remove(require("lazy.core.cache").config.path)
+  -- TODO(kylo252): is this really necessary anymore?
+  local lazy_cache = require "lazy.core.cache"
+  local cache_path = lazy_cache.path
+  if utils.is_directory(cache_path) then
+    vim.fn.delete(cache_path, "rf")
+    vim.fn.mkdir(cache_path, "p")
+  end
 end
 
 function plugin_loader.reload(spec)