Change back to a working config #1

Open
th3r00t wants to merge 16 commits from New-Master into master
2 changed files with 79 additions and 56 deletions
Showing only changes of commit 0b240bf871 - Show all commits

View File

@@ -15,8 +15,21 @@ cmp.setup({
return vim_item return vim_item
end, end,
}, },
-- completion = {
-- completeopt = 'menu,menuone,noinsert',
-- },
completion = {
completeopt = 'menu,menuone,noinsert',
},
performance = {
max_view_entries = 10,
},
window = { window = {
completion = cmp.config.window.bordered(), completion = cmp.config.window.bordered({
-- winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,Search:None",
col_offset = -3,
side_padding = 0,
}),
documentation = cmp.config.window.bordered(), documentation = cmp.config.window.bordered(),
}, },
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
@@ -88,50 +101,51 @@ cmp.setup.cmdline(":", {
}), }),
}) })
local capabilities = require("cmp_nvim_lsp").default_capabilities() -- LSP server configurations moved to lsp.lua to avoid duplicates
require("lspconfig").clangd.setup({ -- local capabilities = require("cmp_nvim_lsp").default_capabilities()
capabilities = capabilities, -- require("lspconfig").clangd.setup({
}) -- capabilities = capabilities,
require("lspconfig").taplo.setup({ -- })
capabilities = capabilities, -- require("lspconfig").taplo.setup({
}) -- capabilities = capabilities,
require("lspconfig").marksman.setup({ -- })
capabilities = capabilities, -- require("lspconfig").marksman.setup({
}) -- capabilities = capabilities,
require("lspconfig").lua_ls.setup({ -- })
capabilities = capabilities, -- require("lspconfig").lua_ls.setup({
}) -- capabilities = capabilities,
require("lspconfig").rust_analyzer.setup({ -- })
capabilities = capabilities, -- require("lspconfig").rust_analyzer.setup({
}) -- capabilities = capabilities,
require("lspconfig").zls.setup({ -- })
capabilities = capabilities, -- require("lspconfig").zls.setup({
}) -- capabilities = capabilities,
require("lspconfig").gopls.setup({ -- })
capabilities = capabilities, -- require("lspconfig").gopls.setup({
settings = { -- capabilities = capabilities,
gopls = { -- settings = {
analyses = { -- gopls = {
unusedparams = true, -- analyses = {
unusedwrite = true, -- unusedparams = true,
shadow = true, -- unusedwrite = true,
}, -- shadow = true,
staticcheck = true, -- },
usePlaceholders = true, -- staticcheck = true,
hints = { -- usePlaceholders = true,
assignVariableTypes = true, -- hints = {
compositeLiteralFields = true, -- assignVariableTypes = true,
compositeLiteralTypes = true, -- compositeLiteralFields = true,
functionTypeParameters = true, -- compositeLiteralTypes = true,
parameterNames = true, -- functionTypeParameters = true,
rangeVariableTypes = true, -- parameterNames = true,
}, -- rangeVariableTypes = true,
}, -- },
}, -- },
}) -- },
require("lspconfig").pyright.setup({ -- })
capabilities = capabilities, -- require("lspconfig").pyright.setup({
}) -- capabilities = capabilities,
require("lspconfig").nim_langserver.setup({ -- })
capabilities = capabilities, -- require("lspconfig").nim_langserver.setup({
}) -- capabilities = capabilities,
-- })

View File

@@ -44,23 +44,32 @@ vim.lsp.enable('basedpyright', {
require("lsp_signature").setup({ require("lsp_signature").setup({
debug = false, debug = false,
bind = true, bind = true,
doc_lines = 10, -- doc_lines = 10,
max_height = 12, -- max_height = 12,
max_width = function() return math.floor(vim.api.nvim_win_get_width(0) * 0.8) end, -- max_width = function() return math.floor(vim.api.nvim_win_get_width(0) * 0.8) end,
doc_lines = 5,
max_height = 8,
max_width = function() return math.floor(vim.api.nvim_win_get_width(0) * 0.7) end,
wrap = true, wrap = true,
floating_window = true, floating_window = true,
floating_window_above_cur_line = true, -- floating_window_above_cur_line = true,
-- floating_window_off_y = 0,
floating_window_above_cur_line = false,
floating_window_off_x = 1, floating_window_off_x = 1,
floating_window_off_y = 0, floating_window_off_y = 1,
hint_enable = true, -- hint_enable = true,
hint_enable = false,
hint_inline = function() return false end, hint_inline = function() return false end,
hint_prefix = "🐼 ", -- hint_prefix = "🐼 ",
hint_prefix = "",
hint_scheme = "String", hint_scheme = "String",
hi_parameter = "LspSignatureActiveParameter", hi_parameter = "LspSignatureActiveParameter",
handler_opts = { border = "rounded" }, handler_opts = { border = "rounded" },
always_trigger = false, always_trigger = false,
auto_close_after = 5,
extra_trigger_chars = { "(", "," }, extra_trigger_chars = { "(", "," },
zindex = 200, -- zindex = 200,
zindex = 50,
padding = "", padding = "",
timer_interval = 200, timer_interval = 200,
}) })