Improve startuptime | remove un-needed plugins | lazy load plugin highlights too
removed nvim-gps as nvim-navic or winbar.nvim will be added when v0.8 neovim releases. Removed lsp signature as I was able to emulate showing args with the default signature help() window
This commit is contained in:
parent
d42ffe1ac7
commit
0bde81a074
21 changed files with 463 additions and 391 deletions
|
|
@ -19,28 +19,9 @@ M.autopairs = function()
|
|||
autopairs.setup(options)
|
||||
|
||||
local cmp_autopairs = require "nvim-autopairs.completion.cmp"
|
||||
|
||||
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
|
||||
end
|
||||
|
||||
M.better_escape = function()
|
||||
local present, escape = pcall(require, "better_escape")
|
||||
|
||||
if not present then
|
||||
return
|
||||
end
|
||||
|
||||
local options = {
|
||||
mapping = { "jk" }, -- a table with mappings to use
|
||||
timeout = vim.o.timeoutlen,
|
||||
clear_empty_lines = false, -- clear line after escaping if there is only whitespace
|
||||
keys = "<Esc>",
|
||||
}
|
||||
|
||||
options = load_override(options, "max397574/better-escape.nvim")
|
||||
escape.setup(options)
|
||||
end
|
||||
|
||||
M.blankline = function()
|
||||
local present, blankline = pcall(require, "indent_blankline")
|
||||
|
||||
|
|
@ -48,6 +29,8 @@ M.blankline = function()
|
|||
return
|
||||
end
|
||||
|
||||
require("base46").load_highlight "blankline"
|
||||
|
||||
local options = {
|
||||
indentLine_enabled = 1,
|
||||
char = "▏",
|
||||
|
|
@ -59,7 +42,6 @@ M.blankline = function()
|
|||
"lspinfo",
|
||||
"TelescopePrompt",
|
||||
"TelescopeResults",
|
||||
"nvchad_cheatsheet",
|
||||
"lsp-installer",
|
||||
"",
|
||||
},
|
||||
|
|
@ -99,9 +81,9 @@ M.colorizer = function()
|
|||
}
|
||||
|
||||
options = load_override(options, "NvChad/nvim-colorizer.lua")
|
||||
|
||||
colorizer.setup(options["filetypes"], options["user_default_options"])
|
||||
vim.cmd "ColorizerReloadAllBuffers"
|
||||
|
||||
vim.cmd "ColorizerAttachToBuffer"
|
||||
end
|
||||
|
||||
M.comment = function()
|
||||
|
|
@ -130,79 +112,9 @@ M.luasnip = function()
|
|||
|
||||
options = load_override(options, "L3MON4D3/LuaSnip")
|
||||
luasnip.config.set_config(options)
|
||||
|
||||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
end
|
||||
|
||||
M.signature = function()
|
||||
local present, lsp_signature = pcall(require, "lsp_signature")
|
||||
|
||||
if not present then
|
||||
return
|
||||
end
|
||||
|
||||
local options = {
|
||||
bind = true,
|
||||
doc_lines = 0,
|
||||
floating_window = true,
|
||||
fix_pos = true,
|
||||
hint_enable = true,
|
||||
hint_prefix = " ",
|
||||
hint_scheme = "String",
|
||||
hi_parameter = "Search",
|
||||
max_height = 22,
|
||||
max_width = 120, -- max_width of signature floating_window, line will be wrapped if exceed max_width
|
||||
handler_opts = {
|
||||
border = "single", -- double, single, shadow, none
|
||||
},
|
||||
zindex = 200, -- by default it will be on top of all floating windows, set to 50 send it to bottom
|
||||
padding = "", -- character to pad on left and right of signature can be ' ', or '|' etc
|
||||
}
|
||||
|
||||
options = load_override(options, "ray-x/lsp_signature.nvim")
|
||||
lsp_signature.setup(options)
|
||||
end
|
||||
|
||||
M.lsp_handlers = function()
|
||||
local function lspSymbol(name, icon)
|
||||
local hl = "DiagnosticSign" .. name
|
||||
vim.fn.sign_define(hl, { text = icon, numhl = hl, texthl = hl })
|
||||
end
|
||||
|
||||
lspSymbol("Error", "")
|
||||
lspSymbol("Info", "")
|
||||
lspSymbol("Hint", "")
|
||||
lspSymbol("Warn", "")
|
||||
|
||||
vim.diagnostic.config {
|
||||
virtual_text = {
|
||||
prefix = "",
|
||||
},
|
||||
signs = true,
|
||||
underline = true,
|
||||
update_in_insert = false,
|
||||
}
|
||||
|
||||
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
|
||||
border = "single",
|
||||
})
|
||||
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
|
||||
border = "single",
|
||||
})
|
||||
|
||||
-- suppress error messages from lang servers
|
||||
vim.notify = function(msg, log_level)
|
||||
if msg:match "exit code" then
|
||||
return
|
||||
end
|
||||
if log_level == vim.log.levels.ERROR then
|
||||
vim.api.nvim_err_writeln(msg)
|
||||
else
|
||||
vim.api.nvim_echo({ { msg } }, true, {})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
M.gitsigns = function()
|
||||
local present, gitsigns = pcall(require, "gitsigns")
|
||||
|
||||
|
|
@ -210,6 +122,8 @@ M.gitsigns = function()
|
|||
return
|
||||
end
|
||||
|
||||
require("base46").load_highlight "git"
|
||||
|
||||
local options = {
|
||||
signs = {
|
||||
add = { hl = "DiffAdd", text = "│", numhl = "GitSignsAddNr" },
|
||||
|
|
@ -219,9 +133,21 @@ M.gitsigns = function()
|
|||
changedelete = { hl = "DiffChangeDelete", text = "~", numhl = "GitSignsChangeNr" },
|
||||
},
|
||||
}
|
||||
options = load_override(options, "lewis6991/gitsigns.nvim")
|
||||
|
||||
options = load_override(options, "lewis6991/gitsigns.nvim")
|
||||
gitsigns.setup(options)
|
||||
end
|
||||
|
||||
M.devicons = function()
|
||||
local present, devicons = pcall(require, "nvim-web-devicons")
|
||||
|
||||
if present then
|
||||
require("base46").load_highlight "devicons"
|
||||
|
||||
local options = { override = require("ui.icons").devicons }
|
||||
options = require("core.utils").load_override(options, "kyazdani42/nvim-web-devicons")
|
||||
devicons.setup(options)
|
||||
end
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue