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