mirror of
https://github.com/traxys/Nixfiles.git
synced 2026-03-13 08:01:10 +01:00
fix nvim breaking changes
This commit is contained in:
parent
d2f7a45d74
commit
ef6a2ccad3
3 changed files with 12 additions and 11 deletions
|
|
@ -76,12 +76,14 @@ require("filetype").setup({
|
|||
},
|
||||
})
|
||||
|
||||
--autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics()
|
||||
|
||||
vim.cmd([[
|
||||
command SpellFr setlocal spell spelllang=fr
|
||||
|
||||
filetype plugin indent on
|
||||
|
||||
autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics()
|
||||
autocmd CursorHold * lua vim.diagnostic.open_float()
|
||||
autocmd CursorHold,CursorHoldI * lua require'nvim-lightbulb'.update_lightbulb()
|
||||
autocmd CursorHold,CursorHoldI *.rs :lua require'lsp_extensions'.inlay_hints{}
|
||||
]])
|
||||
|
|
|
|||
|
|
@ -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(),
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
|
||||
--[[ local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
|
||||
parser_config.rsh = {
|
||||
install_info = {
|
||||
url = "https://github.com/traxys/tree-sitter-rsh/", -- local path or git repo
|
||||
files = { "src/parser.c" },
|
||||
},
|
||||
}
|
||||
|
||||
]]
|
||||
require("nvim-treesitter.configs").setup({
|
||||
ensure_installed = {
|
||||
"rust",
|
||||
|
|
@ -20,7 +20,7 @@ require("nvim-treesitter.configs").setup({
|
|||
"vue",
|
||||
"javascript",
|
||||
"dart",
|
||||
"rsh",
|
||||
--"rsh",
|
||||
},
|
||||
ident = {
|
||||
enable = true,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue