Compare commits

..

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

2 changed files with 171 additions and 194 deletions

View File

@ -1,212 +1,190 @@
return { return {
-- lsp configuration -- lsp configuration
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
event = { "BufReadPre", "BufNewFile" }, event = { "BufReadPre", "BufNewFile" },
dependencies = { dependencies = {
"hrsh7th/cmp-nvim-lsp", "hrsh7th/cmp-nvim-lsp",
{ "antosha417/nvim-lsp-file-operations", config = true }, { "antosha417/nvim-lsp-file-operations", config = true },
"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")
local capabilities = require("lsp-options").capabilities -- import cmp-nvim-lsp plugin
local on_attach = require("lsp-options").on_attach local cmp_nvim_lsp = require("cmp_nvim_lsp")
-- Change the Diagnostic symbols in the sign column (gutter) local capabilities = require("lsp-options").capabilities
local signs = { Error = "󰅚 ", Warn = "󰀪 ", Hint = "󰌶", Info = "󰋽 " } local on_attach = require("lsp-options").on_attach
for type, icon in pairs(signs) do
local hl = "DiagnosticSign" .. type
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
end
-- ┌ ┐ -- Change the Diagnostic symbols in the sign column (gutter)
-- │ Bash │ local signs = { Error = "󰅚 ", Warn = "󰀪 ", Hint = "󰌶", Info = "󰋽 " }
-- └ ┘ for type, icon in pairs(signs) do
lsp.config("bashls", { local hl = "DiagnosticSign" .. type
capabilities = capabilities, vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
on_attach = on_attach, end
})
-- ┌ ┐ -- ┌ ┐
-- │ C, Cpp, objc │ -- │ Bash │
-- └ ┘ -- └ ┘
lsp.config("clangd", { lspconfig.bashls.setup({
cmd = { capabilities = capabilities,
"clangd", on_attach = on_attach,
"--suggest-missing-includes", })
"--clang-tidy",
},
filetypes = { "c", "cpp", "objc", "objcpp", "cuda", "proto", "ino" },
capabilities = capabilities,
on_attach = on_attach,
})
-- ┌ ┐ -- ┌ ┐
-- │ Rust │ -- │ C, Cpp, objc │
-- └ ┘ -- └ ┘
lsp.config("rust_analyzer", { lspconfig.clangd.setup({
settings = { cmd = {
["rust-analyzer"] = { "clangd",
diagnostics = { "--suggest-missing-includes",
enable = true, "--clang-tidy",
}, },
}, filetypes = { "c", "cpp", "objc", "objcpp", "cuda", "proto", "ino" },
}, capabilities = capabilities,
capabilities = capabilities, on_attach = on_attach,
on_attach = on_attach, })
})
-- ┌ ┐ -- ┌ ┐
-- │ HTML, CSS, JSON │ -- │ Rust │
-- └ ┘ -- └ ┘
lsp.config("cssls", { lspconfig.rust_analyzer.setup({
capabilities = capabilities, settings = {
on_attach = on_attach, ["rust-analyzer"] = {
}) diagnostics = {
enable = true,
},
},
},
capabilities = capabilities,
on_attach = on_attach,
})
lsp.config("html", { -- ┌ ┐
capabilities = capabilities, -- │ HTML, CSS, JSON │
on_attach = on_attach, -- └ ┘
}) lspconfig.cssls.setup({
capabilities = capabilities,
on_attach = on_attach,
})
lsp.config("jsonls", { lspconfig.html.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
-- ┌ ┐ lspconfig.jsonls.setup({
-- │ LUA │ capabilities = capabilities,
-- └ ┘ on_attach = on_attach,
lsp.config("lua_ls", { })
capabilities = capabilities,
on_attach = on_attach,
settings = {
Lua = {
-- make the language server recognize "vim" global
diagnostics = {
globals = { "vim" },
},
workspace = {
-- make language server aware of runtime files
library = {
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
[vim.fn.stdpath("config") .. "/lua"] = true,
},
},
},
},
})
-- ┌ ┐ -- ┌ ┐
-- │ Markdown │ -- │ LUA │
-- └ ┘ -- └ ┘
lsp.config("marksman", { lspconfig.lua_ls.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) settings = {
Lua = {
-- make the language server recognize "vim" global
diagnostics = {
globals = { "vim" },
},
workspace = {
-- make language server aware of runtime files
library = {
[vim.fn.expand("$VIMRUNTIME/lua")] = true,
[vim.fn.stdpath("config") .. "/lua"] = true,
},
},
},
},
})
-- ┌ ┐ -- ┌ ┐
-- │ Python │ -- │ Markdown
-- └ ┘ -- └ ┘
lsp.config("pyright", { lspconfig.marksman.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
}) })
-- ┌ ┐ -- ┌ ┐
-- │ Vue │ -- │ Python │
-- └ ┘ -- └ ┘
lsp.config("vue_ls", { lspconfig.pyright.setup({
capabilities = capabilities, capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
filetypes = { })
"vue",
},
})
-- ┌ ┐ -- ┌ ┐
-- │ TS, JS, TSX, JSX │ -- │ Vue, TS, JS, TSX & JSX │
-- └ ┘ -- └ ┘
lsp.config("ts_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({
init_options = { capabilities = capabilities,
plugins = { on_attach = on_attach,
{ init_options = {
name = "@vue/typescript-plugin", plugins = {
location = "/usr/lib/node_modules/@vue/typescript-plugin", {
languages = { "javascript", "typescript", "vue" }, name = "@vue/typescript-plugin",
}, -- location = "/usr/lib/node_modules/@vue/typescript-plugin",
}, location = volar_path,
}, languages = { "vue" },
filetypes = { },
"javascript", },
"typescript", },
"typescriptreact", filetypes = {
"javascriptreact", "javascript",
"vue", "typescript",
}, "typescriptreact",
}) "javascriptreact",
"vue",
},
})
-- ┌ ┐ -- ┌ ┐
-- │ ASM │ -- │ ASM │
-- └ ┘ -- └ ┘
lsp.config("asm_lsp", { lspconfig.asm_lsp.setup({
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
}) })
-- ┌ ┐ -- ┌ ┐
-- │ 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)
return vim.loop.cwd() return vim.loop.cwd()
end, end,
}) })
-- ┌ ┐ -- ┌ ┐
-- │ Verilog │ -- │ Verilog │
-- └ ┘ -- └ ┘
local lspconfutil = require("lspconfig/util") local lspconfutil = require("lspconfig/util")
local root_pattern = lspconfutil.root_pattern("veridian.yml", ".git", ".xpr") local root_pattern = lspconfutil.root_pattern("veridian.yml", ".git", ".xpr")
local verilog_root_dir = function() local verilog_root_dir = function()
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,
}) })
end,
-- ╭───────────────────────────────────────────────╮
-- │ 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,
} }

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",