diff options
-rw-r--r-- | nvim/.config/nvim/lazy-lock.json | 3 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/plugins/core.lua | 12 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/plugins/noice.lua | 67 | ||||
-rw-r--r-- | nvim/.config/nvim/lua/plugins/notify.lua | 7 |
4 files changed, 20 insertions, 69 deletions
diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 9dad422..f37a678 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -20,6 +20,7 @@ "core.nvim": { "branch": "main", "commit": "e6aeba879abb3026db26eca863858e3801c87e94" }, "dressing.nvim": { "branch": "master", "commit": "8b7ae53d7f04f33be3439a441db8071c96092d19" }, "ferris.nvim": { "branch": "main", "commit": "ecc3b463ca8b138ce6a1eaab56c9b9e36d8fb29f" }, + "fidget.nvim": { "branch": "main", "commit": "300018af4abd00610a345e382ca1f4b7ba420f77" }, "git-conflict.nvim": { "branch": "main", "commit": "896261933afe2fddf6fb043d9cd4d88301b151a9" }, "git-log.nvim": { "branch": "main", "commit": "3211b51361a6e7384bed2cba67b0053f57174eea" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, @@ -37,8 +38,6 @@ "neotest-plenary": { "branch": "master", "commit": "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584" }, "neotest-python": { "branch": "master", "commit": "c969a5b0073f2b5c8eaf017d1652f9251d761a15" }, "neotest-rust": { "branch": "main", "commit": "48c1e146ed0eb775fef6aca75903baf3cedadc01" }, - "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, - "nui.nvim": { "branch": "main", "commit": "c9b4de623d19a85b353ff70d2ae9c77143abe69c" }, "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-dap": { "branch": "master", "commit": "d7749eb3d9933a75d2244820308ce442f646c7ae" }, diff --git a/nvim/.config/nvim/lua/plugins/core.lua b/nvim/.config/nvim/lua/plugins/core.lua index 3d70d4f..29ec89e 100644 --- a/nvim/.config/nvim/lua/plugins/core.lua +++ b/nvim/.config/nvim/lua/plugins/core.lua @@ -14,6 +14,18 @@ local M = { opts = {}, }, { + "j-hui/fidget.nvim", + version = "*", + event = { "LspAttach" }, + opts = { + notification = { + window = { + winblend = 0, + }, + }, + }, + }, + { "akinsho/git-conflict.nvim", event = "BufReadPre", opts = { diff --git a/nvim/.config/nvim/lua/plugins/noice.lua b/nvim/.config/nvim/lua/plugins/noice.lua deleted file mode 100644 index 198f25f..0000000 --- a/nvim/.config/nvim/lua/plugins/noice.lua +++ /dev/null @@ -1,67 +0,0 @@ ----@type LazyPluginSpec -local M = { - "folke/noice.nvim", - version = "*", - event = { "LspAttach" }, - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, - opts = { - cmdline = { enabled = false }, - messages = { enabled = false }, - popupmenu = { backend = "cmp" }, - lsp = { - progress = { - format = { - { "{data.progress.message} " }, - "({data.progress.percentage}%) ", - { "{spinner} ", hl_group = "NoiceLspProgressSpinner" }, - { "{data.progress.title} ", hl_group = "NoiceLspProgressTitle" }, - { "{data.progress.client} ", hl_group = "NoiceLspProgressClient" }, - }, - format_done = { - { " ", hl_group = "NoiceLspProgressDone" }, - { "{data.progress.title} ", hl_group = "NoiceLspProgressTitle" }, - { "{data.progress.client} ", hl_group = "NoiceLspProgressClient" }, - }, - }, - }, - views = { - hover = { - border = { style = "single" }, - position = { row = 2, col = 2 }, - }, - mini = { - position = { row = -2 }, - win_options = { winblend = 0 }, - }, - }, - }, -} - -function M:init() - ---@diagnostic disable-next-line: duplicate-set-field - vim.notify = function(...) - return require("noice").notify(...) - end - - vim.api.nvim_set_hl(0, "NoiceLspProgressSpinner", { link = "DiagnosticSignInfo" }) - vim.api.nvim_set_hl(0, "NoiceLspProgressDone", { link = "DiagnosticSignOk" }) - - vim.api.nvim_create_autocmd("LspAttach", { - group = vim.api.nvim_create_augroup("noice-lsp", { clear = true }), - callback = function(args) - vim.keymap.set({ "n", "i", "s" }, "<c-d>", function() - return require("noice.lsp").scroll(4) and "<Ignore>" or "<c-d>" - end, { expr = true, buffer = args.buf, desc = "up half page" }) - - vim.keymap.set({ "n", "i", "s" }, "<c-u>", function() - return require("noice.lsp").scroll(-4) and "<Ignore>" or "<c-u>" - end, { expr = true, buffer = args.buf, desc = "down half page" }) - end, - desc = "setup noice documentation scroll", - }) -end - -return M diff --git a/nvim/.config/nvim/lua/plugins/notify.lua b/nvim/.config/nvim/lua/plugins/notify.lua index 8c02f28..fa70f0a 100644 --- a/nvim/.config/nvim/lua/plugins/notify.lua +++ b/nvim/.config/nvim/lua/plugins/notify.lua @@ -14,4 +14,11 @@ local M = { }, } +function M:init() + ---@diagnostic disable-next-line: duplicate-set-field + vim.notify = function(...) + return require("notify").notify(...) + end +end + return M |