diff --git a/lazy-lock.json b/lazy-lock.json index b80b25c..fc81893 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,12 +13,11 @@ "code_runner.nvim": { "branch": "main", "commit": "0c701cae3265c79b4fdfd4b35a4f3d7c5986d46c" }, "codeium.vim": { "branch": "main", "commit": "9286586f790f837c4c3032f2124559936e77e6ed" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, - "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "impatient.nvim": { "branch": "main", "commit": "969f2c5c90457612c09cf2a13fee1adaa986d350" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "lsp-progress.nvim": { "branch": "main", "commit": "b673377c50ebaf37053f23cc3caeeb6d469ba1c1" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" }, @@ -51,9 +50,7 @@ "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, "transparent.nvim": { "branch": "main", "commit": "fd35a46f4b7c1b244249266bdcb2da3814f01724" }, - "vim-bbye": { "branch": "master", "commit": "903f5eb17f72ebf7b0b1524bbb792c0b36761af6" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, - "vim-repeat": { "branch": "master", "commit": "8106e142dfdc278ff3eaaadd7b362ad7949d4357" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 72c2834..1e75e65 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -31,7 +31,7 @@ vim.g.pcode_clear_lualine = 0 -- 0 disable progress -- 1 lualine lsp progress -- 2 fidget progress -vim.g.pcode_progress = 2 +vim.g.pcode_progress = 1 -- style -- 0 = default diff --git a/lua/custom/plugins/lualine.lua b/lua/custom/plugins/lualine.lua index 602017b..07cd3ae 100644 --- a/lua/custom/plugins/lualine.lua +++ b/lua/custom/plugins/lualine.lua @@ -137,6 +137,12 @@ return { end end + local lsp_progress = {} + local data_ok, lspprogress = pcall(require, "lsp-progress") + if data_ok then + lsp_progress = lspprogress.progress + end + require("lualine").setup({ options = { theme = "auto", @@ -162,7 +168,7 @@ return { mode, }, lualine_b = { get_branch }, - lualine_c = { lsp_info, diagnostics }, + lualine_c = { lsp_info, diagnostics, lsp_progress }, lualine_x = { diff, spaces, "filetype" }, lualine_y = { "progress" }, lualine_z = { diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 61c228e..1b970e5 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -240,13 +240,13 @@ return { -- end, -- }, -- for Speed up loading Lua modules in Neovim to improve startup time. - { - "lewis6991/impatient.nvim", - event = "BufWinEnter", - config = function() - require("user.impatient") - end, - }, + -- { + -- "lewis6991/impatient.nvim", + -- event = "BufWinEnter", + -- config = function() + -- require("user.impatient") + -- end, + -- }, -- for live server html,css,js -- { -- "manzeloth/live-server", @@ -385,5 +385,5 @@ return { end, }, -- remove duplicate - { "tpope/vim-repeat", event = "InsertEnter" }, + -- { "tpope/vim-repeat", event = "InsertEnter" }, } diff --git a/lua/plugins/lspprogress.lua b/lua/plugins/lspprogress.lua index afff102..fedf0d3 100644 --- a/lua/plugins/lspprogress.lua +++ b/lua/plugins/lspprogress.lua @@ -44,11 +44,15 @@ return { config = function() require("lsp-progress").setup({ client_format = function(client_name, spinner, series_messages) - return #series_messages > 0 and (spinner .. " " .. table.concat(series_messages, ", ")) or nil + return #series_messages > 0 + and (spinner .. " " .. string.sub(table.concat(series_messages, ", "), 1, 25) .. " ...") + or nil end, format = function(client_messages) local sign = "" - return #client_messages > 0 and (sign .. " " .. table.concat(client_messages, " ")) or sign + return #client_messages > 0 + and (sign .. " " .. string.sub(table.concat(client_messages, " "), 1, 25) .. " ...") + or sign end, }) end, diff --git a/lua/plugins/ui.lua b/lua/plugins/ui.lua index 710b71e..03c2afa 100644 --- a/lua/plugins/ui.lua +++ b/lua/plugins/ui.lua @@ -54,7 +54,7 @@ return { end, }, -- for delete buffers (close files) without closing your windows or messing up your layout. - { "moll/vim-bbye", event = "InsertEnter" }, + -- { "moll/vim-bbye", event = "InsertEnter" }, -- for view terminal { "akinsho/toggleterm.nvim", diff --git a/lua/user/options.lua b/lua/user/options.lua index cebdc6b..9310b88 100644 --- a/lua/user/options.lua +++ b/lua/user/options.lua @@ -62,3 +62,4 @@ vim.opt.runtimepath:remove("/usr/share/vim/vimfiles") -- separate vim plugins fr -- "i-ci:ver25-Cursor/lCursor-blinkwait1000-blinkon100-blinkoff100", -- "r:hor50-Cursor/lCursor-blinkwait100-blinkon100-blinkoff100", -- } +vim.loader.enable()