mirror of
https://git.aramjonghu.nl/AramJonghu/nvim.git
synced 2026-03-22 09:41:10 +01:00
formatted
This commit is contained in:
Aram Markarov
+62
-77
@@ -1,38 +1,35 @@
|
||||
local cmp = require("cmp")
|
||||
local cmp_lsp = require("cmp_nvim_lsp")
|
||||
local capabilities = vim.tbl_deep_extend(
|
||||
"force",
|
||||
{},
|
||||
vim.lsp.protocol.make_client_capabilities(),
|
||||
cmp_lsp.default_capabilities()
|
||||
)
|
||||
local capabilities = vim.tbl_deep_extend("force", {}, vim.lsp.protocol
|
||||
.make_client_capabilities(),
|
||||
cmp_lsp.default_capabilities())
|
||||
|
||||
local cmp_kinds = { --change later
|
||||
Text = ' ',
|
||||
Method = ' ',
|
||||
Function = ' ',
|
||||
Constructor = ' ',
|
||||
Field = ' ',
|
||||
Variable = ' ',
|
||||
Class = ' ',
|
||||
Interface = ' ',
|
||||
Module = ' ',
|
||||
Property = ' ',
|
||||
Unit = ' ',
|
||||
Value = ' ',
|
||||
Enum = ' ',
|
||||
Keyword = ' ',
|
||||
Snippet = ' ',
|
||||
Color = ' ',
|
||||
File = ' ',
|
||||
Reference = ' ',
|
||||
Folder = ' ',
|
||||
EnumMember = ' ',
|
||||
Constant = ' ',
|
||||
Struct = ' ',
|
||||
Event = ' ',
|
||||
Operator = ' ',
|
||||
TypeParameter = ' ',
|
||||
local cmp_kinds = { -- change later
|
||||
Text = ' ',
|
||||
Method = ' ',
|
||||
Function = ' ',
|
||||
Constructor = ' ',
|
||||
Field = ' ',
|
||||
Variable = ' ',
|
||||
Class = ' ',
|
||||
Interface = ' ',
|
||||
Module = ' ',
|
||||
Property = ' ',
|
||||
Unit = ' ',
|
||||
Value = ' ',
|
||||
Enum = ' ',
|
||||
Keyword = ' ',
|
||||
Snippet = ' ',
|
||||
Color = ' ',
|
||||
File = ' ',
|
||||
Reference = ' ',
|
||||
Folder = ' ',
|
||||
EnumMember = ' ',
|
||||
Constant = ' ',
|
||||
Struct = ' ',
|
||||
Event = ' ',
|
||||
Operator = ' ',
|
||||
TypeParameter = ' '
|
||||
}
|
||||
|
||||
require("fidget").setup({})
|
||||
@@ -40,21 +37,13 @@ require("mason").setup()
|
||||
require("mason-lspconfig").setup({
|
||||
automatic_enable = true,
|
||||
ensure_installed = {
|
||||
"lua_ls",
|
||||
"rust_analyzer",
|
||||
"jdtls",
|
||||
"prettier",
|
||||
"yamlls",
|
||||
"ts_ls",
|
||||
"tailwindcss",
|
||||
"html",
|
||||
"cssls",
|
||||
"shfmt",
|
||||
"lua_ls", "rust_analyzer", "jdtls", "yamlls", "ts_ls", "tailwindcss",
|
||||
"html", "cssls"
|
||||
},
|
||||
handlers = {
|
||||
function(server_name) -- default handler (optional)
|
||||
require("lspconfig")[server_name].setup {
|
||||
capabilities = capabilities,
|
||||
capabilities = capabilities
|
||||
}
|
||||
end,
|
||||
|
||||
@@ -62,14 +51,15 @@ require("mason-lspconfig").setup({
|
||||
local lspconfig = require("lspconfig")
|
||||
lspconfig.zls.setup({
|
||||
capabilities = capabilities,
|
||||
root_dir = lspconfig.util.root_pattern(".git", "build.zig", "zls.json"),
|
||||
root_dir = lspconfig.util.root_pattern(".git", "build.zig",
|
||||
"zls.json"),
|
||||
settings = {
|
||||
zls = {
|
||||
enable_inlay_hints = true,
|
||||
enable_snippets = true,
|
||||
warn_style = true,
|
||||
},
|
||||
},
|
||||
warn_style = true
|
||||
}
|
||||
}
|
||||
})
|
||||
vim.g.zig_fmt_parse_errors = 0
|
||||
vim.g.zig_fmt_autosave = 0
|
||||
@@ -81,42 +71,43 @@ require("mason-lspconfig").setup({
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = { version = "Lua 5.1" },
|
||||
runtime = {version = "Lua 5.1"},
|
||||
diagnostics = {
|
||||
globals = { "bit", "vim", "it", "describe", "before_each", "after_each" },
|
||||
globals = {
|
||||
"bit", "vim", "it", "describe", "before_each",
|
||||
"after_each"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
end,
|
||||
end
|
||||
}
|
||||
})
|
||||
|
||||
cmp.setup {
|
||||
formatting = {
|
||||
fields = { 'kind', 'abbr' },
|
||||
fields = {'kind', 'abbr'},
|
||||
format = function(entry, vim_item)
|
||||
vim_item.kind = cmp_kinds[vim_item.kind] or ''
|
||||
if entry.completion_item.detail then
|
||||
vim_item.menu = entry.completion_item.detail
|
||||
end
|
||||
return vim_item
|
||||
end,
|
||||
end
|
||||
},
|
||||
completion = { completeopt = "menu,menuone" },
|
||||
completion = {completeopt = "menu,menuone"},
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
require("luasnip").lsp_expand(args.body)
|
||||
end,
|
||||
expand = function(args) require("luasnip").lsp_expand(args.body) end
|
||||
},
|
||||
mapping = { --change later zach is ????
|
||||
mapping = { -- change later zach is ????
|
||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.close(),
|
||||
["<CR>"] = cmp.mapping.confirm {
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
select = true
|
||||
},
|
||||
["<Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
@@ -126,7 +117,7 @@ cmp.setup {
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
end, {"i", "s"}),
|
||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
@@ -135,16 +126,13 @@ cmp.setup {
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { "i", "s" }),
|
||||
end, {"i", "s"})
|
||||
},
|
||||
|
||||
sources = cmp.config.sources({
|
||||
{ name = "path" },
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" }, -- snip snip
|
||||
{ name = "buffer" },
|
||||
{ name = "nvim_lua" },
|
||||
}),
|
||||
{name = "path"}, {name = "nvim_lsp"}, {name = "luasnip"}, -- snip snip
|
||||
{name = "buffer"}, {name = "nvim_lua"}
|
||||
})
|
||||
}
|
||||
|
||||
vim.diagnostic.config({
|
||||
@@ -156,21 +144,18 @@ vim.diagnostic.config({
|
||||
border = "rounded",
|
||||
source = "always",
|
||||
header = "",
|
||||
prefix = "",
|
||||
},
|
||||
prefix = ""
|
||||
}
|
||||
})
|
||||
|
||||
vim.api.nvim_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", { noremap = true, silent = true })
|
||||
vim.api.nvim_set_keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>",
|
||||
{noremap = true, silent = true})
|
||||
vim.api.nvim_set_keymap("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>",
|
||||
{noremap = true, silent = true})
|
||||
|
||||
local lspconfig = require "lspconfig"
|
||||
|
||||
-- EXAMPLE
|
||||
local servers = {
|
||||
local servers = {}
|
||||
|
||||
}
|
||||
|
||||
for _, server in ipairs(servers) do
|
||||
lspconfig[server].setup {
|
||||
}
|
||||
end
|
||||
for _, server in ipairs(servers) do lspconfig[server].setup {} end
|
||||
|
||||
Reference in New Issue
Block a user