oops3
This commit is contained in:
+5
-4
@@ -12,11 +12,11 @@
|
|||||||
"command-completion.nvim": { "branch": "main", "commit": "56c98f8d59a88ed96a80d43abca74a60ba31ea3a" },
|
"command-completion.nvim": { "branch": "main", "commit": "56c98f8d59a88ed96a80d43abca74a60ba31ea3a" },
|
||||||
"copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" },
|
"copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" },
|
||||||
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "ac21a639c7ecfc8b822dcc9455deceea3778f839" },
|
"lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" },
|
||||||
"lightline-gruvbox.vim": { "branch": "master", "commit": "d233416d566e61f879bd19d9d498b01b1b7e336c" },
|
"lightline-gruvbox.vim": { "branch": "master", "commit": "d233416d566e61f879bd19d9d498b01b1b7e336c" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
|
"lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "a8e6efcf623b86bae6d2223eede7c43883329f80" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "1114b2336e917d883c30f89cd63ba94050001b2d" },
|
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" },
|
"nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" },
|
||||||
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
|
"nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" },
|
||||||
"nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" },
|
"nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" },
|
||||||
@@ -27,8 +27,9 @@
|
|||||||
"nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" },
|
"nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" },
|
||||||
"onedarkpro.nvim": { "branch": "main", "commit": "992780fb5b28abcef125271c8c2c41e302c2df26" },
|
"onedarkpro.nvim": { "branch": "main", "commit": "992780fb5b28abcef125271c8c2c41e302c2df26" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
|
"presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
|
||||||
"rainbow-delimiters.nvim": { "branch": "master", "commit": "011d98eaa3a73b5a51d82ce5bc6b1397dde95562" },
|
"rainbow-delimiters.nvim": { "branch": "master", "commit": "011d98eaa3a73b5a51d82ce5bc6b1397dde95562" },
|
||||||
"snacks.nvim": { "branch": "main", "commit": "74ce61b727cd0b34468464ffbfbb380f192de592" },
|
"snacks.nvim": { "branch": "main", "commit": "b02cb5e8826179b385b870edbda1631213391cf1" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" },
|
"telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" },
|
||||||
"undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" },
|
"undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" },
|
||||||
"vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" },
|
"vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" },
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require("bufferline").setup ({
|
require("bufferline").setup ({
|
||||||
options = {
|
options = {
|
||||||
diagnostics = "coc",
|
diagnostics = "nvim_lsp",
|
||||||
diagnostics_indicator = function(count, level, diagnostics_dict, context)
|
diagnostics_indicator = function(count, level, diagnostics_dict, context)
|
||||||
local s = " "
|
local s = " "
|
||||||
for e, n in pairs(diagnostics_dict) do
|
for e, n in pairs(diagnostics_dict) do
|
||||||
@@ -10,6 +10,8 @@ require("bufferline").setup ({
|
|||||||
end
|
end
|
||||||
return s
|
return s
|
||||||
end,
|
end,
|
||||||
|
show_close_icon = false,
|
||||||
|
show_buffer_close_icons = false,
|
||||||
always_show_bufferline = true,
|
always_show_bufferline = true,
|
||||||
offsets = {
|
offsets = {
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,8 +55,6 @@ require("mason-lspconfig").setup({
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
local cmp_select = { behaivior = cmp.SelectBehavior.Select }
|
|
||||||
|
|
||||||
cmp.setup {
|
cmp.setup {
|
||||||
completion = { completeopt = "menu,menuone" },
|
completion = { completeopt = "menu,menuone" },
|
||||||
snippet = {
|
snippet = {
|
||||||
@@ -72,12 +70,10 @@ cmp.setup {
|
|||||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
["<C-Space>"] = cmp.mapping.complete(),
|
||||||
["<C-e>"] = cmp.mapping.close(),
|
["<C-e>"] = cmp.mapping.close(),
|
||||||
|
|
||||||
["<CR>"] = cmp.mapping.confirm {
|
["<CR>"] = cmp.mapping.confirm {
|
||||||
behavior = cmp.ConfirmBehavior.Insert,
|
behavior = cmp.ConfirmBehavior.Insert,
|
||||||
select = true,
|
select = true,
|
||||||
},
|
},
|
||||||
|
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
@@ -87,7 +83,6 @@ cmp.setup {
|
|||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end, { "i", "s" }),
|
end, { "i", "s" }),
|
||||||
|
|
||||||
["<S-Tab>"] = cmp.mapping(function(fallback)
|
["<S-Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_prev_item()
|
cmp.select_prev_item()
|
||||||
@@ -105,19 +100,9 @@ cmp.setup {
|
|||||||
{ name = "luasnip" },
|
{ name = "luasnip" },
|
||||||
{ name = "buffer" },
|
{ name = "buffer" },
|
||||||
{ name = "nvim_lua" },
|
{ name = "nvim_lua" },
|
||||||
{ name = "async_path" },
|
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
|
|
||||||
cmp.setup.cmdline(':', {
|
|
||||||
mapping = cmp.mapping.preset.cmdline(),
|
|
||||||
sources = cmp.config.sources({
|
|
||||||
{ name = 'path' },
|
|
||||||
{ name = 'cmdline' },
|
|
||||||
}),
|
|
||||||
matching = { disallow_symbol_nonprefix_matching = false },
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
-- update_in_insert = true,
|
-- update_in_insert = true,
|
||||||
float = {
|
float = {
|
||||||
@@ -149,9 +134,3 @@ for _, server in ipairs(servers) do
|
|||||||
lspconfig[server].setup {
|
lspconfig[server].setup {
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
-- lspconfig.hyprls.setup {
|
|
||||||
-- root_dir = vim.fs.root( 0, 'hyprland.conf' ),
|
|
||||||
-- single_file_support = false,
|
|
||||||
-- filetypes = { "conf" },
|
|
||||||
-- }
|
|
||||||
|
|||||||
@@ -67,9 +67,6 @@ local function format_message(message, percentage)
|
|||||||
return (percentage and percentage .. "%\t" or "") .. (message or "")
|
return (percentage and percentage .. "%\t" or "") .. (message or "")
|
||||||
end
|
end
|
||||||
|
|
||||||
-- LSP integration
|
|
||||||
-- Make sure to also have the snippet with the common helper functions in your config!
|
|
||||||
|
|
||||||
vim.lsp.handlers["$/progress"] = function(_, result, ctx)
|
vim.lsp.handlers["$/progress"] = function(_, result, ctx)
|
||||||
local client_id = ctx.client_id
|
local client_id = ctx.client_id
|
||||||
|
|
||||||
@@ -110,7 +107,6 @@ vim.lsp.handlers["$/progress"] = function(_, result, ctx)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- table from lsp severity to vim severity.
|
|
||||||
local severity = {
|
local severity = {
|
||||||
"error",
|
"error",
|
||||||
"warn",
|
"warn",
|
||||||
@@ -121,9 +117,6 @@ vim.lsp.handlers["window/showMessage"] = function(err, method, params, client_id
|
|||||||
vim.notify(method.message, severity[params.type])
|
vim.notify(method.message, severity[params.type])
|
||||||
end
|
end
|
||||||
|
|
||||||
-- DAP integration
|
|
||||||
-- Make sure to also have the snippet with the common helper functions in your config!
|
|
||||||
|
|
||||||
dap.listeners.before['event_progressStart']['progress-notifications'] = function(session, body)
|
dap.listeners.before['event_progressStart']['progress-notifications'] = function(session, body)
|
||||||
local notif_data = get_notif_data("dap", body.progressId)
|
local notif_data = get_notif_data("dap", body.progressId)
|
||||||
|
|
||||||
|
|||||||
@@ -134,7 +134,6 @@ return {
|
|||||||
char = {
|
char = {
|
||||||
corner_top = "╭",
|
corner_top = "╭",
|
||||||
corner_bottom = "╰",
|
corner_bottom = "╰",
|
||||||
|
|
||||||
vertical = "│",
|
vertical = "│",
|
||||||
arrow = "╼",
|
arrow = "╼",
|
||||||
},
|
},
|
||||||
@@ -177,6 +176,10 @@ return {
|
|||||||
border = nil,
|
border = nil,
|
||||||
highlight_selection = true,
|
highlight_selection = true,
|
||||||
use_matchfuzzy = true,
|
use_matchfuzzy = true,
|
||||||
|
tab_completion = true,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"andweeb/presence.nvim",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user