Skip to content

Commit

Permalink
Merge pull request #313 from izumin5210/izumin5210/fidget
Browse files Browse the repository at this point in the history
chore(neovim): use fidget.nvim instead of lualine-lsp-progress
  • Loading branch information
izumin5210 authored Apr 7, 2024
2 parents 9fd4b2d + 4c1796c commit 328a067
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
20 changes: 18 additions & 2 deletions config/.config/nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ require('lazy').setup({
flavour = 'frappe',
transparent_background = true,
integrations = {
-- ...
fidget = true,
}
})
end,
Expand All @@ -295,9 +295,25 @@ require('lazy').setup({
'nvim-lualine/lualine.nvim',
cond = not vim.g.vscode,
event = { 'InsertEnter', 'CursorHold', 'FocusLost', 'BufRead', 'BufNewFile' },
dependencies = { 'arkav/lualine-lsp-progress' },
config = require('pluginconfig.lualine').setup,
},
{
"j-hui/fidget.nvim",
version = '*',
event = 'LspAttach',
cond = not vim.g.vscode,
config = function ()
require('fidget').setup({
notification = {
window = {
winblend = 0,
x_padding = 1,
y_padding = 1,
},
},
})
end,
},
{
'akinsho/bufferline.nvim',
cond = not vim.g.vscode,
Expand Down
2 changes: 1 addition & 1 deletion config/.config/nvim/lazy-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
"copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
"dial.nvim": { "branch": "master", "commit": "27eb570085db2ef44bff4f620d3806039184651c" },
"fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
"flit.nvim": { "branch": "main", "commit": "04f744bbb2b91fb2ad2c702b5eb8e23d17924fa6" },
"git.nvim": { "branch": "main", "commit": "6b4a66f8a66e567bf27a0ef1de72cf5e338df4c3" },
"gitsigns.nvim": { "branch": "main", "commit": "81369ed5405ec0c5d55a9608b495dbf827415116" },
Expand All @@ -24,7 +25,6 @@
"lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
"lspsaga.nvim": { "branch": "main", "commit": "a4d442896a9ff1f83ee3db965d81b659ebc977d5" },
"lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "2ba17cecfde8b8c7c7c287909a1e4de895223df6" },
"mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" },
Expand Down
3 changes: 1 addition & 2 deletions config/.config/nvim/lua/pluginconfig/lualine.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ function M.setup()
color = { fg = palette.teal }
},
'filename',
{ 'aerial', sep = '', dence = true }, -- the same as copmonent separator
{ 'lsp_progress' }
{ 'aerial', sep = '', dence = true }, -- the same as copmonent separator
},
lualine_x = { 'encoding' },
lualine_y = { 'progress' },
Expand Down

0 comments on commit 328a067

Please sign in to comment.