diff --git a/rcfiles/neovim.lua b/rcfiles/neovim.lua index f29899b..b5f5b8f 100644 --- a/rcfiles/neovim.lua +++ b/rcfiles/neovim.lua @@ -37,37 +37,36 @@ vim.keymap.set('n', 'fh', tbuiltin.help_tags, {}) vim.keymap.set('n', 'fs', tbuiltin.spell_suggest, {}) -- General LSP settings -local sign = function(opts) - vim.fn.sign_define(opts.name, { - texthl = opts.name, - text = opts.text, - numhl = '' - }) -end - -sign({name = 'DiagnosticSignError', text = '🛑'}) -sign({name = 'DiagnosticSignWarn', text = '⚠️'}) -sign({name = 'DiagnosticSignHint', text = '💭'}) -sign({name = 'DiagnosticSignInfo', text = '🗒️'}) vim.lsp.enable('pylsp') +-- LSP diagnostic signs vim.diagnostic.config({ - virtual_text = false, + virtual_text = true, signs = true, update_in_insert = true, underline = true, - severity_sort = false, - float = { - border = 'rounded', - source = 'always', - header = '', - prefix = '', - }, + severity_sort = true, + signs = { + text = { + [vim.diagnostic.severity.ERROR] = "E", + [vim.diagnostic.severity.WARN] = "W", + [vim.diagnostic.severity.INFO] = "I", + [vim.diagnostic.severity.HINT] = "?" + }, + numhl = { + [vim.diagnostic.severity.ERROR] = "ErrorMsg", + [vim.diagnostic.severity.WARN] = "WarningMsg", + [vim.diagnostic.severity.INFO] = "DiagnosticInfo", + [vim.diagnostic.severity.HINT] = "DiagnosticHint" + } + } }) +vim.keymap.set('n', 'd', 'lua vim.diagnostic.open_float()', { noremap = true, silent = true }) + vim.cmd([[ -set signcolumn=yes -autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false }) + set signcolumn=yes + autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false }) ]]) -- Rust tools for Rust-specific LSP