diff --git a/lazy-lock.json b/lazy-lock.json index aea55b6..29a374d 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,11 +12,11 @@ "command-completion.nvim": { "branch": "main", "commit": "56c98f8d59a88ed96a80d43abca74a60ba31ea3a" }, "copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" }, "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" }, "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a8e6efcf623b86bae6d2223eede7c43883329f80" }, - "mason.nvim": { "branch": "main", "commit": "1114b2336e917d883c30f89cd63ba94050001b2d" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, + "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, "nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" }, @@ -27,8 +27,9 @@ "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" }, "onedarkpro.nvim": { "branch": "main", "commit": "992780fb5b28abcef125271c8c2c41e302c2df26" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "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" }, "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" }, "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" }, diff --git a/lua/config/barbar.lua b/lua/config/barbar.lua index 8fe7033..922119d 100644 --- a/lua/config/barbar.lua +++ b/lua/config/barbar.lua @@ -1,6 +1,6 @@ require("bufferline").setup ({ options = { - diagnostics = "coc", + diagnostics = "nvim_lsp", diagnostics_indicator = function(count, level, diagnostics_dict, context) local s = " " for e, n in pairs(diagnostics_dict) do @@ -10,6 +10,8 @@ require("bufferline").setup ({ end return s end, + show_close_icon = false, + show_buffer_close_icons = false, always_show_bufferline = true, offsets = { { diff --git a/lua/config/lspconfig.lua b/lua/config/lspconfig.lua index c9db17c..47313ce 100644 --- a/lua/config/lspconfig.lua +++ b/lua/config/lspconfig.lua @@ -55,8 +55,6 @@ require("mason-lspconfig").setup({ } }) -local cmp_select = { behaivior = cmp.SelectBehavior.Select } - cmp.setup { completion = { completeopt = "menu,menuone" }, snippet = { @@ -72,12 +70,10 @@ cmp.setup { [""] = cmp.mapping.scroll_docs(4), [""] = cmp.mapping.complete(), [""] = cmp.mapping.close(), - [""] = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Insert, select = true, }, - [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() @@ -87,7 +83,6 @@ cmp.setup { fallback() end end, { "i", "s" }), - [""] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_prev_item() @@ -105,19 +100,9 @@ cmp.setup { { name = "luasnip" }, { name = "buffer" }, { 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({ -- update_in_insert = true, float = { @@ -149,9 +134,3 @@ for _, server in ipairs(servers) do lspconfig[server].setup { } end - --- lspconfig.hyprls.setup { --- root_dir = vim.fs.root( 0, 'hyprland.conf' ), --- single_file_support = false, --- filetypes = { "conf" }, --- } diff --git a/lua/config/notify.lua b/lua/config/notify.lua index bf69c44..e0035ff 100644 --- a/lua/config/notify.lua +++ b/lua/config/notify.lua @@ -67,9 +67,6 @@ local function format_message(message, percentage) return (percentage and percentage .. "%\t" or "") .. (message or "") 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) local client_id = ctx.client_id @@ -110,7 +107,6 @@ vim.lsp.handlers["$/progress"] = function(_, result, ctx) end end --- table from lsp severity to vim severity. local severity = { "error", "warn", @@ -121,9 +117,6 @@ vim.lsp.handlers["window/showMessage"] = function(err, method, params, client_id vim.notify(method.message, severity[params.type]) 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) local notif_data = get_notif_data("dap", body.progressId) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 166be52..b1dd92f 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -134,7 +134,6 @@ return { char = { corner_top = "╭", corner_bottom = "╰", - vertical = "│", arrow = "╼", }, @@ -177,6 +176,10 @@ return { border = nil, highlight_selection = true, use_matchfuzzy = true, + tab_completion = true, }, }, + { + "andweeb/presence.nvim", + }, }