From 4529ed7b434457d38c7f1dd182855d7dc4ec6640 Mon Sep 17 00:00:00 2001
From: PowerUser64 <blakelysnorth@gmail.com>
Date: Fri, 13 May 2022 04:28:53 -0700
Subject: [PATCH] nvim: fix lspconfig and lspinstall to work together
---
.config/nvim/lua/blake/plugins.lua | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua
index 02615fd..124c860 100644
--- a/.config/nvim/lua/blake/plugins.lua
+++ b/.config/nvim/lua/blake/plugins.lua
@@ -78,16 +78,16 @@ return require('packer').startup({function()
}
-- IDE features
- ---- LSP (document analysis)
- use { -- lsp installer
+ ---- LSP
+ use { -- lspinstall + lspconfig
'williamboman/nvim-lsp-installer',
- }
- use { -- Default LSP configs
- 'neovim/nvim-lspconfig',
- before = 'williamboman/nvim-lsp-installer',
- config = function()
- require('blake.lsp').lspconfig()
- end
+ { -- lspconfig
+ 'neovim/nvim-lspconfig',
+ config = function()
+ require('blake.lsp').lspinstall()
+ require('blake.lsp').lspconfig()
+ end
+ }
}
use { -- commentstring based on context from treesitter
'JoosepAlviste/nvim-ts-context-commentstring',
@@ -195,6 +195,7 @@ return require('packer').startup({function()
-- }
use { -- terminal
'akinsho/toggleterm.nvim',
+ tag = 'v1.*',
config = function()
require('blake.other').toggleterm()
end