diff --git a/modules/home-manager/programs/neovim/lsp.nix b/modules/home-manager/programs/neovim/lsp.nix index 5896a1a..3156bb1 100644 --- a/modules/home-manager/programs/neovim/lsp.nix +++ b/modules/home-manager/programs/neovim/lsp.nix @@ -61,7 +61,6 @@ in "cmake", "csharp_ls", "cssls", - "denols", "eslint", "html", "jsonls", @@ -71,7 +70,7 @@ in "rust_analyzer", "svelte", "taplo", - "ts_ls", + "tsserver", "volar", "yamlls", }, @@ -94,7 +93,7 @@ in }, }, }, - ts_ls = { + tsserver = { init_options = { plugins = { { @@ -109,7 +108,6 @@ in "typescript", "vue", }, - root_dir = require("lspconfig.util").root_pattern("package.json"), }, }, -- customize how language servers are attached diff --git a/modules/home-manager/programs/neovim/lua/plugins/user.lua b/modules/home-manager/programs/neovim/lua/plugins/user.lua index d00c2e9..c46e009 100644 --- a/modules/home-manager/programs/neovim/lua/plugins/user.lua +++ b/modules/home-manager/programs/neovim/lua/plugins/user.lua @@ -26,7 +26,6 @@ return { end, }, - -- Add the catppuccin colorscheme { "catppuccin/nvim", name = "catppuccin", @@ -119,6 +118,11 @@ return { "CursorColumn", "CursorLineFold", "CursorLineSign", + "DiagnosticSignError", + "DiagnosticSignHint", + "DiagnosticSignInfo", + "DiagnosticSignOk", + "DiagnosticSignWarn", "FloatBorder", "FoldColumn", "Folded", @@ -129,6 +133,7 @@ return { "LineNrAbove", "LineNrBelow", "LineNrBelow", + "NvimTreeWindowPicker", "TabLine", "TabLineFill", "VertSplit", @@ -138,9 +143,7 @@ return { } transparent.clear_prefix("BufferLine") - transparent.clear_prefix("Diagnostic") transparent.clear_prefix("NeoTree") - transparent.clear_prefix("NvimTree") end, },