Update lsp config for newest neovimHEADmaster

1 files changed, 18 insertions, 10 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 77876e8..db5f547 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -10,16 +10,24 @@ local vimrcpath = path_join { vim.api.nvim_eval [[stdpath('config')]], 'vimrc' }
 vim.cmd {cmd='source', args={vimrcpath}}
 
 
--- Lsp servers
-local lspconfig = require('lspconfig')
-lspconfig.clangd.setup {filetypes = {'c', 'cc', 'cpp', 'h', 'hpp', 'cxx'}}
---lspconfig.futhark_lsp.setup {}
-----lspconfig.rust_analyzer.setup {}
---local def_opts = { noremap = true, silent = true, }
---lspconfig.hls.setup{
---  filetypes = { 'haskell', 'lhaskell', 'cabal' },
---}
--- Lsp options
+--- Change `require'lspconfig'[…]` to `vim.lsp.config(…)`.
+--  - Some field names changed, see |lspconfig-vs-vim.lsp.config|.
+--  - See |lsp-config| for details.
+
+vim.lsp.config('*', { root_markers = { '.git' } })
+
+vim.lsp.enable('clangd')
+vim.lsp.config('clangd', {
+  cmd = {
+    'clangd',
+    '--clang-tidy',
+    '--background-index',
+    '--offset-encoding=utf-8',
+  },
+  root_markers = { '.clang-format', 'compile_commands.json' },
+  filetypes = {'c', 'cc', 'cpp', 'h', 'hpp', 'cxx'}
+})
+
 vim.api.nvim_create_autocmd('LspAttach', {
   group = vim.api.nvim_create_augroup('UserLspConfig', {}),
   callback = function(ev)