evan/nix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(nvim): add svelte ls

Browse Source
This commit is contained in:
Evan Reichard 2024-02-11 11:13:00 -05:00
parent 24300b24ae
commit 270a78aaea
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nvim/config/lua/lsp-config.lua
View File

@ -41,7 +41,7 @@ nvim_lsp.html.setup {
on_attach = on_attach_no_formatting, on_attach = on_attach_no_formatting,
flags = lsp_flags, flags = lsp_flags,
capabilities = capabilities, capabilities = capabilities,
cmd = {nix_vars.vscodels .. "/bin/vscode-html-language-server", "--stdio"} cmd = {nix_vars.vscls, "--stdio"}
} }
-- JSON LSP Configuration -- JSON LSP Configuration
@ -49,7 +49,7 @@ nvim_lsp.jsonls.setup {
on_attach = on_attach_no_formatting, on_attach = on_attach_no_formatting,
flags = lsp_flags, flags = lsp_flags,
capabilities = capabilities, capabilities = capabilities,
cmd = {nix_vars.vscodels .. "/bin/vscode-json-language-server", "--stdio"} cmd = {nix_vars.vscls, "--stdio"}
} }
-- CSS LSP Configuration -- CSS LSP Configuration
@ -57,7 +57,7 @@ nvim_lsp.cssls.setup {
on_attach = on_attach_no_formatting, on_attach = on_attach_no_formatting,
flags = lsp_flags, flags = lsp_flags,
capabilities = capabilities, capabilities = capabilities,
cmd = {nix_vars.vscodels .. "/bin/vscode-css-language-server", "--stdio"} cmd = {nix_vars.vscls, "--stdio"}
} }
-- Typescript / Javascript LSP Configuration -- Typescript / Javascript LSP Configuration
@ -69,8 +69,7 @@ nvim_lsp.tsserver.setup {
["textDocument/publishDiagnostics"] = function() end ["textDocument/publishDiagnostics"] = function() end
}, },
capabilities = capabilities, capabilities = capabilities,
cmd = {nix_vars.tsserver, "--stdio"} cmd = {nix_vars.tsls, "--stdio"}
-- cmd = {nix_vars.tsserver, "--stdio", "--tsserver-path", nix_vars.tslib}
} }
-- Javascript / Typescript LSP Configuration -- Javascript / Typescript LSP Configuration
@ -78,15 +77,18 @@ nvim_lsp.eslint.setup {
on_attach = on_attach_no_formatting, on_attach = on_attach_no_formatting,
flags = lsp_flags, flags = lsp_flags,
capabilities = capabilities, capabilities = capabilities,
cmd = {nix_vars.vscodels .. "/bin/vscode-eslint-language-server", "--stdio"} cmd = {nix_vars.vscls, "--stdio"}
} }
-- Svelte LSP Configuration
nvim_lsp.svelte.setup {cmd = {nix_vars.sveltels, "--stdio"}}
-- Go LSP Configuration -- Go LSP Configuration
nvim_lsp.gopls.setup { nvim_lsp.gopls.setup {
on_attach = on_attach_no_formatting, on_attach = on_attach_no_formatting,
flags = lsp_flags, flags = lsp_flags,
capabilities = capabilities, capabilities = capabilities,
cmd = {nix_vars.gopls .. "/bin/gopls"} cmd = {nix_vars.gopls}
} }
------------------------------------------------------ ------------------------------------------------------
@ -112,6 +114,7 @@ null_ls.setup({
return utils.has_file(".eslintrc.yml") return utils.has_file(".eslintrc.yml")
end end
}), null_ls.builtins.formatting.djlint.with({filetypes = {"template"}}), }), null_ls.builtins.formatting.djlint.with({filetypes = {"template"}}),
null_ls.builtins.formatting.prettier.with({filetypes = {"svelte"}}),
null_ls.builtins.completion.spell, null_ls.builtins.completion.spell,
null_ls.builtins.formatting.nixpkgs_fmt, null_ls.builtins.formatting.nixpkgs_fmt,
null_ls.builtins.formatting.lua_format, null_ls.builtins.formatting.lua_format,

1
nvim/config/lua/telescope-config.lua
View File

@ -16,3 +16,4 @@ vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
vim.keymap.set('n', '<leader>fg', builtin.live_grep, {}) vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
vim.keymap.set('n', '<leader>fb', builtin.buffers, {}) vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
vim.keymap.set('n', '<leader>fh', builtin.help_tags, {}) vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
vim.keymap.set('n', '<leader>fj', builtin.jumplist, {})

1
nvim/config/lua/which-key-config.lua
View File

@ -32,6 +32,7 @@ wk.register({
f = {"<cmd>Telescope find_files<cr>", "Find File"}, f = {"<cmd>Telescope find_files<cr>", "Find File"},
g = {"<cmd>Telescope live_grep<cr>", "Live Grep"}, g = {"<cmd>Telescope live_grep<cr>", "Live Grep"},
b = {"<cmd>Telescope buffers<cr>", "Find Buffer"}, b = {"<cmd>Telescope buffers<cr>", "Find Buffer"},
j = {"<cmd>Telescope jumplist<cr>", "Jump List"},
h = {"<cmd>Telescope help_tags<cr>", "Help Tags"} h = {"<cmd>Telescope help_tags<cr>", "Help Tags"}
}, },
l = { l = {

9
nvim/default.nix
View File

@ -95,6 +95,7 @@ in
gopls gopls
nodePackages.eslint nodePackages.eslint
nodePackages.pyright nodePackages.pyright
nodePackages.svelte-language-server
nodePackages.typescript nodePackages.typescript
nodePackages.typescript-language-server nodePackages.typescript-language-server
nodePackages.vscode-langservers-extracted nodePackages.vscode-langservers-extracted
@ -124,10 +125,10 @@ in
# Generate Nix Vars # Generate Nix Vars
"nvim/lua/nix-vars.lua".text = '' "nvim/lua/nix-vars.lua".text = ''
local nix_vars = { local nix_vars = {
tsserver = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server", gopls = "${pkgs.gopls}/bin/gopls",
tslib = "${pkgs.nodePackages.typescript}/lib/node_modules/typescript/lib/", sveltels = "${pkgs.nodePackages.svelte-language-server}/bin/svelteserver",
vscodels = "${pkgs.nodePackages.vscode-langservers-extracted}", tsls = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server",
gopls = "${pkgs.gopls}", vscls = "${pkgs.nodePackages.vscode-langservers-extracted}/bin/vscode-html-language-server",
} }
return nix_vars return nix_vars
''; '';