janishutz/nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: janishutz:68c12127c226ea237385d0a9177ae699e165d877
Branches Tags
janishutz:main
..
compare: janishutz:ea0a0c68c6ee1ddfe41e004a23b376cad8d62ac1
Branches Tags
janishutz:main

No commits in common. "68c12127c226ea237385d0a9177ae699e165d877" and "ea0a0c68c6ee1ddfe41e004a23b376cad8d62ac1" have entirely different histories.
68c12127c2 ... ea0a0c68c6

2 changed files with 171 additions and 194 deletions
Show Stats Expand all files Collapse all files

72
nvim/lua/plugins/lsp/lspconfig.lua
View File

@ -8,8 +8,11 @@ return {
"mfussenegger/nvim-jdtls", "mfussenegger/nvim-jdtls",
}, },
config = function() config = function()
local lsp = vim.lsp -- import lspconfig plugin
local enable = vim.lsp.enable local lspconfig = require("lspconfig")
-- import cmp-nvim-lsp plugin
local cmp_nvim_lsp = require("cmp_nvim_lsp")
local capabilities = require("lsp-options").capabilities local capabilities = require("lsp-options").capabilities
local on_attach = require("lsp-options").on_attach local on_attach = require("lsp-options").on_attach
@ -24,7 +27,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ Bash │ -- │ Bash │
-- └ ┘ -- └ ┘
lsp.config("bashls", { lspconfig.bashls.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
@ -32,7 +35,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ C, Cpp, objc │ -- │ C, Cpp, objc │
-- └ ┘ -- └ ┘
lsp.config("clangd", { lspconfig.clangd.setup({
cmd = { cmd = {
"clangd", "clangd",
"--suggest-missing-includes", "--suggest-missing-includes",
@ -46,7 +49,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ Rust │ -- │ Rust │
-- └ ┘ -- └ ┘
lsp.config("rust_analyzer", { lspconfig.rust_analyzer.setup({
settings = { settings = {
["rust-analyzer"] = { ["rust-analyzer"] = {
diagnostics = { diagnostics = {
@ -61,17 +64,17 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ HTML, CSS, JSON │ -- │ HTML, CSS, JSON │
-- └ ┘ -- └ ┘
lsp.config("cssls", { lspconfig.cssls.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
lsp.config("html", { lspconfig.html.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
lsp.config("jsonls", { lspconfig.jsonls.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
@ -79,7 +82,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ LUA │ -- │ LUA │
-- └ ┘ -- └ ┘
lsp.config("lua_ls", { lspconfig.lua_ls.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
settings = { settings = {
@ -102,7 +105,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ Markdown │ -- │ Markdown │
-- └ ┘ -- └ ┘
lsp.config("marksman", { lspconfig.marksman.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
@ -110,34 +113,26 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ Python │ -- │ Python │
-- └ ┘ -- └ ┘
lsp.config("pyright", { lspconfig.pyright.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
-- ┌ ┐ -- ┌ ┐
-- │ Vue │ -- │ Vue, TS, JS, TSX & JSX │
-- └ ┘ -- └ ┘
lsp.config("vue_ls", { local mason_packages = vim.fn.stdpath("data") .. "/mason/packages"
capabilities = capabilities, local volar_path = mason_packages .. "/vue-language-server/node_modules/@vue/language-server"
on_attach = on_attach, lspconfig.ts_ls.setup({
filetypes = {
"vue",
},
})
-- ┌ ┐
-- │ TS, JS, TSX, JSX │
-- └ ┘
lsp.config("ts_ls", {
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
init_options = { init_options = {
plugins = { plugins = {
{ {
name = "@vue/typescript-plugin", name = "@vue/typescript-plugin",
location = "/usr/lib/node_modules/@vue/typescript-plugin", -- location = "/usr/lib/node_modules/@vue/typescript-plugin",
languages = { "javascript", "typescript", "vue" }, location = volar_path,
languages = { "vue" },
}, },
}, },
}, },
@ -153,7 +148,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ ASM │ -- │ ASM │
-- └ ┘ -- └ ┘
lsp.config("asm_lsp", { lspconfig.asm_lsp.setup({
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
}) })
@ -161,7 +156,7 @@ return {
-- ┌ ┐ -- ┌ ┐
-- │ LaTeX │ -- │ LaTeX │
-- └ ┘ -- └ ┘
lsp.config("texlab", { lspconfig.texlab.setup({
cmd = { "texlab" }, cmd = { "texlab" },
filetypes = { "tex", "latex", "bib" }, filetypes = { "tex", "latex", "bib" },
root_dir = function(fname) root_dir = function(fname)
@ -178,35 +173,18 @@ return {
local filename = lspconfutil.path.join(vim.loop.cwd(), fname) local filename = lspconfutil.path.join(vim.loop.cwd(), fname)
return root_pattern(filename) or lspconfutil.path.dirname(filename) return root_pattern(filename) or lspconfutil.path.dirname(filename)
end end
lsp.config("veridian", { lspconfig.veridian.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
root_dir = verilog_root_dir, root_dir = verilog_root_dir,
}) })
lsp.config("verible", { lspconfig.verible.setup({
-- cmd = { 'verible-verilog-ls', '--rules_config=/home/janis/.config/nvim/util/verible-conf.json' }, -- cmd = { 'verible-verilog-ls', '--rules_config=/home/janis/.config/nvim/util/verible-conf.json' },
cmd = { "verible-verilog-ls", "--rules=-no-trailing-spaces", "" }, cmd = { "verible-verilog-ls", "--rules=-no-trailing-spaces", "" },
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
root_dir = verilog_root_dir, root_dir = verilog_root_dir,
}) })
-- ╭───────────────────────────────────────────────╮
-- │ Enable the configs │
-- ╰───────────────────────────────────────────────╯
enable("bashls")
enable("clangd")
enable("rust_analyzer")
enable("marksman")
enable("vue_ls")
enable("ts_ls")
enable("texlab")
enable("asm_lsp")
enable("jsonls")
enable("cssls")
enable("html")
enable("lua_ls")
enable("pyright")
end, end,
} }

1
nvim/lua/plugins/lsp/mason.lua
View File

@ -25,7 +25,6 @@ return {
mason_lspconfig.setup({ mason_lspconfig.setup({
-- list of servers for mason to install -- list of servers for mason to install
ensure_installed = { ensure_installed = {
"asm-lsp",
-- "bashls", -- "bashls",
-- "clangd", -- "clangd",
-- "cssls", -- "cssls",