From 5f35102a96b971573820003b9575b5252eb3258f Mon Sep 17 00:00:00 2001
From: Jonathan Hodgson <git@jonathanh.co.uk>
Date: Tue, 7 Sep 2021 17:00:35 +0100
Subject: [PATCH] VIM: Fixes lsp config

---
 nvim/.config/nvim/after/plugin/lsp.vim | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nvim/.config/nvim/after/plugin/lsp.vim b/nvim/.config/nvim/after/plugin/lsp.vim
index f8b60955..b575dd07 100644
--- a/nvim/.config/nvim/after/plugin/lsp.vim
+++ b/nvim/.config/nvim/after/plugin/lsp.vim
@@ -3,18 +3,21 @@ if !has('nvim')
   finish
 endif
 lua <<EOF
+	if ( vim.lsp == nil ) then
+		vim.api.nvim_command("finish")
+	end
 	-- Bash Language Server
-	require'nvim_lsp'.bashls.setup{}
+	require'lspconfig'.bashls.setup{}
 	-- Clang Language Server
-	require'nvim_lsp'.clangd.setup{}
+	require'lspconfig'.clangd.setup{}
 	-- Go Language Server
-	require'nvim_lsp'.gopls.setup{}
+	require'lspconfig'.gopls.setup{}
 	-- Python Language Server
-	require'nvim_lsp'.pyls.setup{}
+	--require'lspconfig'.pyls.setup{}
 	-- Vim Language Server
-	require'nvim_lsp'.vimls.setup{}
+	require'lspconfig'.vimls.setup{}
 	-- VUE Language Server
-	require'nvim_lsp'.vuels.setup{}
+	require'lspconfig'.vuels.setup{}
 EOF
 function! s:ConfigureBuffer()
 	nnoremap <buffer> <silent> <c-]> <cmd>lua vim.lsp.buf.definition()<CR>