2 files changed, 8 insertions, 28 deletions
diff --git a/lua/lv-lspinstall/init.lua b/lua/lv-lspinstall/init.lua
deleted file mode 100644
index f6796fe3..00000000
--- a/lua/lv-lspinstall/init.lua
+++ /dev/null
@@ -1,27 +0,0 @@
--- 1. get the config for this server from nvim-lspconfig and adjust the cmd path.
---    relative paths are allowed, lspinstall automatically adjusts the cmd and cmd_cwd for us!
--- local config = require("lspconfig").jdtls.document_config
--- require("lspconfig/configs").jdtls = nil -- important, unset the loaded config again
--- config.default_config.cmd[1] = "./node_modules/.bin/bash-language-server"
-
--- 2. extend the config with an install_script and (optionally) uninstall_script
--- require'lspinstall/servers'.jdtls = vim.tbl_extend('error', config, {
---     -- lspinstall will automatically create/delete the install directory for every server
---     install_script = [[
---       git clone https://github.com/eclipse/eclipse.jdt.ls.git
---       cd eclipse.jdt.ls
---       ./mvnw clean verify
---   ]],
---     uninstall_script = nil -- can be omitted
--- })
-
--- require'lspinstall/servers'.kotlin = vim.tbl_extend('error', config, {
---     install_script = [[
---       git clone https://github.com/fwcd/kotlin-language-server.git language-server
---       cd language-server
--- 	  ./gradlew :server:installDist
---   ]],
---     uninstall_script = nil -- can be omitted
--- })
-
-require("lspinstall").setup()
diff --git a/lua/plugins.lua b/lua/plugins.lua
index d1f52074..d476f01c 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -29,7 +29,14 @@ return require("packer").startup(function(use)
 
   -- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function)
   use { "neovim/nvim-lspconfig" }
-  use { "kabouzeid/nvim-lspinstall", event = "VimEnter" }
+  use {
+    "kabouzeid/nvim-lspinstall",
+    event = "VimEnter",
+    config = function()
+      require("lspinstall").setup()
+    end,
+  }
+
   use { "nvim-lua/popup.nvim" }
   use { "nvim-lua/plenary.nvim" }
   use { "tjdevries/astronauta.nvim" }