traxys/Nixfiles
1
0
Fork 0
mirror of https://github.com/traxys/Nixfiles.git synced 2026-02-16 04:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix nvim breaking changes

Browse source
This commit is contained in:
Quentin Boyer 2021-12-14 19:06:36 +01:00
parent d2f7a45d74
commit ef6a2ccad3
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nvim/lua/lsp.lua
View file

@ -9,8 +9,6 @@ local sources = {
--null_ls.builtins.diagnostics.codespell,
}
null_ls.config({ sources = sources })
local lsp_status = require("lsp-status")
lsp_status.register_progress()
@ -23,7 +21,7 @@ local lspconfig = require("lspconfig")
local configs = require("lspconfig/configs")
local util = require("lspconfig/util")
if not lspconfig.rsh_lsp then
--[[ if not lspconfig.rsh_lsp then
configs.rsh_lsp = {
default_config = {
cmd = { "rsh-lsp" },
@ -32,9 +30,10 @@ if not lspconfig.rsh_lsp then
settings = {},
},
}
end
end ]]
lspconfig["null-ls"].setup({
null_ls.setup({
sources = sources,
on_attach = lsp_status.on_attach,
})
lspconfig.rust_analyzer.setup({
@ -64,10 +63,10 @@ lspconfig.bashls.setup({
on_attach = lsp_status.on_attach,
capabilities = capabilities,
})
lspconfig.rsh_lsp.setup({
--[[ lspconfig.rsh_lsp.setup({
on_attach = lsp_status.on_attach,
capabilities = capabilities,
})
}) ]]
lspconfig.clangd.setup({
on_attach = lsp_status.on_attach,
handlers = lsp_status.extensions.clangd.setup(),