diff --git a/nvim/lua/plugins/ai.lua b/nvim/lua/plugins/ai.lua index 3a48c16..f739f01 100644 --- a/nvim/lua/plugins/ai.lua +++ b/nvim/lua/plugins/ai.lua @@ -46,7 +46,6 @@ return { { "yetone/avante.nvim", event = "VeryLazy", - lazy = false, dependencies = { "stevearc/dressing.nvim", "nvim-lua/plenary.nvim", diff --git a/nvim/lua/plugins/completion.lua b/nvim/lua/plugins/completion.lua index 94e8136..10efda6 100644 --- a/nvim/lua/plugins/completion.lua +++ b/nvim/lua/plugins/completion.lua @@ -1,6 +1,7 @@ return { { 'saghen/blink.cmp', + event = "VeryLazy", dependencies = { "yetone/avante.nvim", 'saghen/blink.compat', @@ -35,7 +36,6 @@ return { "ripgrep", "avante_commands", "avante_mentions", - "avante_files" }, providers = { ripgrep = { @@ -49,12 +49,6 @@ return { score_offset = 90, opts = {}, }, - avante_files = { - name = "avante_files", - module = "blink.compat.source", - score_offset = 100, - opts = {}, - }, avante_mentions = { name = "avante_mentions", module = "blink.compat.source", diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index e42d743..e1b2443 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -51,7 +51,7 @@ return { lspconfig.jedi_language_server.setup { capabilities = capabilities } lspconfig.nil_ls.setup { capabilities = capabilities } lspconfig.phpactor.setup { capabilities = capabilities } - lspconfig.ruby_ls.setup { capabilities = capabilities } + lspconfig.ruby_lsp.setup { capabilities = capabilities } lspconfig.lua_ls.setup { capabilities = capabilities, on_init = function(client) @@ -101,12 +101,6 @@ return { vim.lsp.buf.code_action, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP code action' } ) - vim.keymap.set( - 'n', - 'dd', - function() Snacks.picker.diagnostics() end, - { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP diagnostics' } - ) vim.keymap.set( 'n', 'df', diff --git a/nvim/lua/plugins/mini.lua b/nvim/lua/plugins/mini.lua index 76819f4..5d95310 100644 --- a/nvim/lua/plugins/mini.lua +++ b/nvim/lua/plugins/mini.lua @@ -47,6 +47,7 @@ return { require('mini.align').setup() require('mini.bracketed').setup() require('mini.icons').setup() + require('mini.jump2d').setup({ mappings = { start_jumping = 'S' } }); require('mini.surround').setup() require('mini.splitjoin').setup { detect = { separator = '[,;\n]' }, } require('mini.trailspace').setup() diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua index 22f28bf..ecfb603 100644 --- a/nvim/lua/plugins/snacks.lua +++ b/nvim/lua/plugins/snacks.lua @@ -1,8 +1,9 @@ return { { "folke/snacks.nvim", - priority = 1000, + dependencies = { "folke/trouble.nvim" }, lazy = false, + priority = 1000, opts = { bigfile = { enabled = true }, notifier = { enabled = true }, @@ -19,10 +20,17 @@ return { return vim.o.columns >= 120 and "telescope" or "vertical" end }, + actions = { + trouble_open = function(...) + return require("trouble.sources.snacks").actions.trouble_open.action(...) + end, + }, win = { input = { keys = { ["wq"] = { "close", mode = "i" }, + [""] = { "trouble_open", mode = { "n", "i" }, + }, } }, list = { @@ -44,7 +52,7 @@ return { { 'ff', function() Snacks.picker.smart() end, - { noremap = true, silent = true, desc = 'Fuzzy find git files' } + { noremap = true, silent = true, desc = 'Fuzzy find files' } }, { 'fa',