From d5bb8c832733a4e03f7fd1c619f053163f2ae615 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Mon, 16 Jun 2025 18:46:56 -0400 Subject: [PATCH] wip: cleanup my sign definition for new version of neovim --- nix/base-system/init.lua | 41 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/nix/base-system/init.lua b/nix/base-system/init.lua index 4d2f210..69ba887 100644 --- a/nix/base-system/init.lua +++ b/nix/base-system/init.lua @@ -195,18 +195,9 @@ require('roslyn').setup({ log_level = "Trace", }); ---ocaml -configure_lsp('ocamllsp', { - capabilities = caps -}) - --- Java language server support -configure_lsp('java_language_server', { - capabilities = caps -}) - -- Typescript language server support configure_lsp('tsserver', { + cmd = { 'typescript-language-server', '--stdio' }, capabilities = caps }) @@ -223,6 +214,7 @@ configure_lsp('rust_analyzer', { -- lua language server setup. configure_lsp('lua_ls', { + cmd = { 'lua-language-server' }, settings = { Lua = { runtime = { version = 'LuaJIT', }, @@ -244,6 +236,12 @@ configure_lsp('lua_ls', { capabilities = caps }) +configure_lsp('ty', { + cmd = { 'ty', 'server' }, + filetypes = { 'python' }, + root_markers = { 'ty.toml', 'pyproject.toml', '.git' }, +}) + -- lsp configuration vim.api.nvim_create_autocmd('LspAttach', { callback = function(args) @@ -275,18 +273,19 @@ vim.api.nvim_create_autocmd({ 'BufEnter', 'InsertLeave', 'CursorHold' }, { }) -- LSP Diagnostics Options Setup -local sign = function(opts) - vim.fn.sign_define(opts.name, { - texthl = opts.name, - text = opts.text, - numhl = '' - }) -end +vim.diagnostics.config({ signs = { + text = { + [vim.diagnostic.severity.ERROR] = '🔥', + [vim.diagnostic.severity.WARN] = '⚠️', + [vim.diagnostic.severity.HINT] = '➡️', + [vim.diagnostic.severity.INFO] = '🗒️', + }, +}) -sign({ name = 'DiagnosticSignError', text = '🔥' }) -sign({ name = 'DiagnosticSignWarn', text = '⚠️' }) -sign({ name = 'DiagnosticSignHint', text = '➡️' }) -sign({ name = 'DiagnosticSignInfo', text = '🗒️' }) +--sign({ name = 'DiagnosticSignError', text = '🔥' }) +--sign({ name = 'DiagnosticSignWarn', text = '⚠️' }) +--sign({ name = 'DiagnosticSignHint', text = '➡️' }) +--sign({ name = 'DiagnosticSignInfo', text = '🗒️' }) vim.diagnostic.config({ virtual_text = false,