From a0bd84df02ce235123dfc939327e8bd33dffdd7e Mon Sep 17 00:00:00 2001 From: Elvis Claros Castro Date: Sat, 27 Jun 2026 22:48:15 -0300 Subject: Remplazando y eliminando plugins a favor de cosas nativas. --- lua/plugins/codecompanion.lua | 81 ++++++++++------ lua/plugins/comment.lua | 5 - lua/plugins/direnv.lua | 5 - lua/plugins/dressing.lua | 205 --------------------------------------- lua/plugins/image.lua | 24 ----- lua/plugins/indent-blankline.lua | 5 - lua/plugins/luarocks.lua | 5 - lua/plugins/neocolumn.lua | 5 - lua/plugins/noice.lua | 1 - lua/plugins/nvim-bqf.lua | 10 -- lua/plugins/smart-splits.lua | 34 ------- lua/plugins/snacks.lua | 2 +- lua/plugins/transparent.lua | 5 - lua/plugins/treesitter.lua | 19 +++- lua/plugins/trouble.lua | 7 -- lua/plugins/twilight.lua | 5 - lua/plugins/vim-illuminate.lua | 21 ---- lua/plugins/vim-lastplace.lua | 4 - lua/plugins/worktree.lua | 23 ----- lua/plugins/zenmode.lua | 44 --------- 20 files changed, 71 insertions(+), 439 deletions(-) delete mode 100644 lua/plugins/comment.lua delete mode 100644 lua/plugins/direnv.lua delete mode 100644 lua/plugins/dressing.lua delete mode 100644 lua/plugins/image.lua delete mode 100644 lua/plugins/indent-blankline.lua delete mode 100644 lua/plugins/luarocks.lua delete mode 100644 lua/plugins/neocolumn.lua delete mode 100644 lua/plugins/nvim-bqf.lua delete mode 100644 lua/plugins/smart-splits.lua delete mode 100644 lua/plugins/transparent.lua delete mode 100644 lua/plugins/trouble.lua delete mode 100644 lua/plugins/twilight.lua delete mode 100644 lua/plugins/vim-illuminate.lua delete mode 100644 lua/plugins/vim-lastplace.lua delete mode 100644 lua/plugins/worktree.lua delete mode 100644 lua/plugins/zenmode.lua (limited to 'lua/plugins') diff --git a/lua/plugins/codecompanion.lua b/lua/plugins/codecompanion.lua index 90c78b8..7b805a7 100644 --- a/lua/plugins/codecompanion.lua +++ b/lua/plugins/codecompanion.lua @@ -129,24 +129,6 @@ return { log_level = "DEBUG", }, config = function() - -- Compatibility patch for recent CodeCompanion/Copilot model schemas - -- where `schema.model.choices` can be a function instead of a table. - local adapter_utils = require("codecompanion.utils.adapters") - adapter_utils.model_choice = function(adapter) - local model = adapter_utils.model(adapter) - local choices = adapter.schema.model.choices - - if type(choices) == "function" then - choices = choices(adapter, { async = false }) - end - - if type(choices) ~= "table" then - return nil - end - - return choices[model] - end - require("codecompanion").setup({ mcp = { servers = { @@ -169,6 +151,15 @@ return { }) end, }, + acp = { + claude_code = function() + return require("codecompanion.adapters").extend("claude_code", { + env = { + CLAUDE_CODE_OAUTH_TOKEN = "cmd:echo $CLAUDE_CODE_OAUTH_TOKEN", + }, + }) + end, + }, }, interactions = { chat = { @@ -214,29 +205,61 @@ return { }, -- adapter = "llama.cpp", adapter = { - name = "copilot", - model = "gpt-5-mini", + name ="claude_code", + -- model = "claude-opus-4-8", + -- model = "claude-sonnet-4-6", + model = "claude-haiku-4-5", }, + -- adapter = { + -- name = "copilot", + -- model = "gpt-4.1", + -- }, }, inline = { - -- adapter = "llama.cpp", adapter = { - name = "copilot", - model = "gpt-5-mini", + name ="claude_code", + model = "claude-haiku-4-5", + -- model = "claude-sonnet-4-6", }, + -- adapter = "llama.cpp", + -- adapter = { + -- name = "copilot", + -- model = "gpt-4.1", + -- }, }, cmd = { - -- adapter = "llama.cpp", adapter = { - name = "copilot", - model = "gpt-5-mini", + name ="claude_code", + model = "claude-haiku-4-5", + -- model = "claude-sonnet-4-6", }, + -- adapter = "llama.cpp", + -- adapter = { + -- name = "copilot", + -- model = "gpt-4.1", + -- }, }, background = { - -- adapter = "llama.cpp" adapter = { - name = "copilot", - model = "gpt-5-mini", + name ="claude_code", + model = "claude-haiku-4-5", + -- model = "claude-sonnet-4-6", + }, + -- adapter = "llama.cpp" + -- adapter = { + -- name = "copilot", + -- model = "gpt-4.1", + -- }, + }, + cli = { + agent = "claude_code", + agents = { + claude_code = { + cmd = "claude", + args = {}, + description = "Claude Code CLI", + provider = "terminal", + }, }, }, }, diff --git a/lua/plugins/comment.lua b/lua/plugins/comment.lua deleted file mode 100644 index 801223b..0000000 --- a/lua/plugins/comment.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "numToStr/Comment.nvim", - keys = { { "gcc", desc = "Comment current line" }, { "gc", mode = "v", desc = "Comment selected text" } }, - config = true, -} diff --git a/lua/plugins/direnv.lua b/lua/plugins/direnv.lua deleted file mode 100644 index df3d01d..0000000 --- a/lua/plugins/direnv.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "direnv/direnv.vim", - lazy = false, - priority = 900, -} diff --git a/lua/plugins/dressing.lua b/lua/plugins/dressing.lua deleted file mode 100644 index 188453b..0000000 --- a/lua/plugins/dressing.lua +++ /dev/null @@ -1,205 +0,0 @@ -return { - "stevearc/dressing.nvim", - event = "VeryLazy", - opts = { - -- ===================================================== - -- Input Configuration - Enhanced vim.ui.input - -- ===================================================== - input = { - enabled = true, - default_prompt = "󰘳 Input:", - prompt_align = "center", - insert_only = true, - start_in_insert = true, - - -- ========== Window Styling ========== - border = "rounded", - relative = "editor", - - -- ========== Size Configuration ========== - prefer_width = 50, - width = nil, - max_width = { 140, 0.8 }, - min_width = { 30, 0.3 }, - - -- ========== Window Options ========== - win_options = { - winblend = 0, -- No transparency for better readability - wrap = false, - cursorline = true, - cursorlineopt = "both", - -- Better highlighting - winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:PmenuSel", - }, - - -- ========== Enhanced Key Mappings ========== - mappings = { - n = { - [""] = "Close", - [""] = "Confirm", - ["q"] = "Close", - [""] = "Close", - }, - i = { - [""] = "Close", - [""] = "Confirm", - [""] = "HistoryPrev", - [""] = "HistoryNext", - [""] = "HistoryPrev", - [""] = "HistoryNext", - [""] = function() vim.api.nvim_del_current_line() end, - [""] = "Close", - }, - }, - - -- ========== Custom Configuration Function ========== - get_config = function(opts) - -- Customize based on prompt type - if opts.prompt and opts.prompt:find("rename", 1, true) then - return { - relative = "cursor", - row = 1, - col = 0, - } - end - -- For file operations, make window larger - if opts.prompt and (opts.prompt:find("file", 1, true) or opts.prompt:find("path", 1, true)) then - return { - prefer_width = 80, - } - end - end, - }, - - -- ===================================================== - -- Select Configuration - Enhanced vim.ui.select - -- ===================================================== - select = { - enabled = true, -- Enable for better selection UI - - -- ========== Backend Priority ========== - backend = { "telescope", "builtin", "nui" }, - trim_prompt = true, - - -- ========== Telescope Integration ========== - telescope = require('telescope.themes').get_dropdown({ - layout_config = { - width = 0.6, - height = 0.6, - }, - borderchars = { - prompt = { "─", "│", " ", "│", "┌", "┐", "│", "│" }, - results = { "─", "│", "─", "│", "├", "┤", "┘", "└" }, - preview = { "─", "│", "─", "│", "┌", "┐", "┘", "└" }, - }, - }), - - -- ========== FZF Configuration ========== - fzf = { - window = { - width = 0.7, - height = 0.6, - }, - }, - - -- ========== NUI Configuration ========== - nui = { - position = "50%", - size = nil, - relative = "editor", - border = { - style = "rounded", - text = { - top = " Select ", - top_align = "center", - }, - }, - buf_options = { - swapfile = false, - filetype = "DressingSelect", - }, - win_options = { - winblend = 0, - winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:PmenuSel", - }, - max_width = 100, - max_height = 50, - min_width = 50, - min_height = 15, - }, - - -- ========== Built-in Selector Configuration ========== - builtin = { - border = "rounded", - relative = "editor", - - -- ========== Enhanced Window Options ========== - win_options = { - winblend = 0, - cursorline = true, - winhighlight = "Normal:Normal,FloatBorder:FloatBorder,CursorLine:PmenuSel", - }, - - -- ========== Size Configuration ========== - width = nil, - max_width = { 120, 0.8 }, - min_width = { 50, 0.4 }, - height = nil, - max_height = 0.8, - min_height = { 15, 0.3 }, - - -- ========== Enhanced Key Mappings ========== - mappings = { - [""] = "Close", - [""] = "Close", - [""] = "Confirm", - ["q"] = "Close", - ["j"] = "Next", - ["k"] = "Prev", - [""] = "Next", - [""] = "Prev", - [""] = "Next", - [""] = "Prev", - }, - }, - - -- ========== Format Item Override ========== - format_item_override = { - -- Add icons for common items - codeaction = function(action_tuple) - local title = action_tuple[2].title:gsub("\r\n", "\\r\\n") - local client = action_tuple[1] - return string.format(" %s - %s", title, client) - end, - }, - - -- ========== Dynamic Configuration ========== - get_config = function(opts) - -- For code actions, use telescope if available - if opts.kind == "codeaction" then - return { - backend = { "telescope", "builtin" }, - telescope = require('telescope.themes').get_cursor({ - layout_config = { - width = 0.6, - height = 0.4, - }, - }), - } - end - - -- For LSP references/definitions, prefer telescope - if opts.kind == "references" or opts.kind == "definitions" then - return { - backend = { "telescope" }, - } - end - - -- For simple selections, use builtin - return { - backend = { "builtin", "telescope" }, - } - end, - }, - }, -} diff --git a/lua/plugins/image.lua b/lua/plugins/image.lua deleted file mode 100644 index edd938f..0000000 --- a/lua/plugins/image.lua +++ /dev/null @@ -1,24 +0,0 @@ - -return { - "3rd/image.nvim", - opts = { - backend = "sixel", - max_width = nil, - max_height = nil, - max_width_window_percentage = nil, - max_height_window_percentage = nil, - window_overlap_clear_enabled = true, - window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "notify", "noice", "lazy", "mason", "oil_list", "TelescopePrompt" }, - editor_only_render_when_focused = true, - tmux_show_only_in_active_window = true, - render = { - debounce_ms = 10, - show_label = true, - label_align = "center", - label_format = "[image.nvim] %s", - foreground_color = true, - background_color = true, - }, - integrations = {}, - }, -} diff --git a/lua/plugins/indent-blankline.lua b/lua/plugins/indent-blankline.lua deleted file mode 100644 index 08fc717..0000000 --- a/lua/plugins/indent-blankline.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - opts = {} -} diff --git a/lua/plugins/luarocks.lua b/lua/plugins/luarocks.lua deleted file mode 100644 index c8dfe6c..0000000 --- a/lua/plugins/luarocks.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "vhyrro/luarocks.nvim", - priority = 1000, -- Very high priority is required, luarocks.nvim should run as the first plugin in your config. - config = true, -} diff --git a/lua/plugins/neocolumn.lua b/lua/plugins/neocolumn.lua deleted file mode 100644 index f02b5b5..0000000 --- a/lua/plugins/neocolumn.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "ecthelionvi/NeoColumn.nvim", - opts = {}, - cmd = { "ToggleNeoColumn" }, -} diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua index 033db3c..57dd934 100644 --- a/lua/plugins/noice.lua +++ b/lua/plugins/noice.lua @@ -233,7 +233,6 @@ return { any = { { event = "msg_show", find = "lines yanked" }, { event = "msg_show", find = "more lines" }, - { event = "msg_show", find = "direnv:" }, { find = "laravel.sail." }, { find = "Pattern not found" }, { event = "msg_show", kind = "", find = "change;" }, diff --git a/lua/plugins/nvim-bqf.lua b/lua/plugins/nvim-bqf.lua deleted file mode 100644 index 5de7214..0000000 --- a/lua/plugins/nvim-bqf.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - 'kevinhwang91/nvim-bqf', - ft = 'qf', - opts = { - auto_resize_height = true, - preview = { - wrap = true, - }, - }, - } diff --git a/lua/plugins/smart-splits.lua b/lua/plugins/smart-splits.lua deleted file mode 100644 index 57faedb..0000000 --- a/lua/plugins/smart-splits.lua +++ /dev/null @@ -1,34 +0,0 @@ -return { - "mrjones2014/smart-splits.nvim", - config = true, - keys = { - { - "", - function() - require("smart-splits").resize_left() - end, - desc = "Resize window left +10", - }, - { - "", - function() - require("smart-splits").resize_down() - end, - desc = "Resize window down +10", - }, - { - "", - function() - require("smart-splits").resize_up() - end, - desc = "Resize window up +10", - }, - { - "", - function() - require("smart-splits").resize_right() - end, - desc = "Resize window right +10", - }, - }, -} diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index c6b63b3..6fa90e8 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -12,7 +12,7 @@ return { notifier = { enabled = true }, picker = { enabled = true, - ui_select = false, + ui_select = true, jump = { reuse_win = true, }, diff --git a/lua/plugins/transparent.lua b/lua/plugins/transparent.lua deleted file mode 100644 index e8a6939..0000000 --- a/lua/plugins/transparent.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "xiyaowong/nvim-transparent", - lazy = false, - config = true, -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 80f98cf..aa17471 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -29,7 +29,10 @@ return { 'TSPlaygroundToggle', }, opts = { - endwise = { enable = true }, + endwise = { + enable = true, + disable = { "markdown", "markdown_inline" }, + }, auto_install = true, ensure_installed = { "bash", @@ -68,6 +71,10 @@ return { }, highlight = { enable = true, + disable = function(_, buf) + local ft = vim.bo[buf].filetype + return ft == "oil" or ft == "snacks_notif" + end, additional_vim_regex_highlighting = { "org" }, }, playground = { @@ -83,6 +90,7 @@ return { }, indent = { enable = true, + disable = { "oil", "snacks_notif" }, }, textobjects = { select = { @@ -125,6 +133,15 @@ return { } }) + -- Reuse markdown parser for plugin-specific scratch buffers. + vim.treesitter.language.register("markdown", "codecompanion") + vim.treesitter.language.register("markdown", "snacks_notif") + vim.treesitter.language.register("markdown", "oil") + + -- Some markdown injections generated by external plugins can point to + -- placeholder languages and crash parser injection resolution. + pcall(vim.treesitter.query.set, "markdown", "injections", "") + require(plug.main).setup(config); end, } diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua deleted file mode 100644 index 5a87f26..0000000 --- a/lua/plugins/trouble.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - "folke/trouble.nvim", - enabled = true, - dependencies = "kyazdani42/nvim-web-devicons", - keys = { { "t", "TroubleToggle", desc = "Trouble toggle" } }, - config = true, -} diff --git a/lua/plugins/twilight.lua b/lua/plugins/twilight.lua deleted file mode 100644 index 144111f..0000000 --- a/lua/plugins/twilight.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "folke/twilight.nvim", - cmd = { "Twilight" }, - config = true, -} diff --git a/lua/plugins/vim-illuminate.lua b/lua/plugins/vim-illuminate.lua deleted file mode 100644 index 9ed467e..0000000 --- a/lua/plugins/vim-illuminate.lua +++ /dev/null @@ -1,21 +0,0 @@ -return - { - 'RRethy/vim-illuminate', - event = 'LspAttach', - keys = { - { - desc = 'Next Reference', - ']r', - function() require('illuminate').goto_next_reference() end, - }, - { - desc = 'Previous Reference', - '[r', - function() require('illuminate').goto_prev_reference() end, - }, - }, - opts = { - providers = { 'lsp' }, - }, - config = function(_, opts) require('illuminate').configure(opts) end, - } diff --git a/lua/plugins/vim-lastplace.lua b/lua/plugins/vim-lastplace.lua deleted file mode 100644 index 3de39ec..0000000 --- a/lua/plugins/vim-lastplace.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - 'farmergreg/vim-lastplace', - event = 'BufReadPre', - } diff --git a/lua/plugins/worktree.lua b/lua/plugins/worktree.lua deleted file mode 100644 index 9e74a9c..0000000 --- a/lua/plugins/worktree.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - "ThePrimeagen/git-worktree.nvim", - keys = { - { - "gt", - function() - require("telescope").extensions.git_worktree.git_worktrees() - end, - desc = "Git Worktree switch", - }, - { - "gn", - function() - require("telescope").extensions.git_worktree.create_git_worktree() - end, - desc = "Git Worktree new branch", - }, - }, - config = function() - require("git-worktree").setup {} - require("telescope").load_extension "git_worktree" - end, -} diff --git a/lua/plugins/zenmode.lua b/lua/plugins/zenmode.lua deleted file mode 100644 index a6922c6..0000000 --- a/lua/plugins/zenmode.lua +++ /dev/null @@ -1,44 +0,0 @@ --- Calculate min width of the window should be 70% of the editor width or 90 columns --- whichever is smaller -local function zen_mode_width() - local width = vim.api.nvim_win_get_width(0) - local min_width = math.max(width * 0.70, 90) - return math.min(width, min_width) -end - -return { - { - "folke/zen-mode.nvim", - cmd = { "ZenMode" }, - opts = { - window = { - width = zen_mode_width(), - }, - plugins = { - options = { - enabled = true, - ruler = false, -- disables the ruler text in the cmd line area - showcmd = false, -- disables the command in the last line of the screen - laststatus = 0, -- turn off the statusline in zen mode - }, - -- NOTE: Those options are disables by default, change to enabled = true to enable - gitsigns = { enabled = false }, -- disables git signs - tmux = { enabled = false }, -- disables the tmux statusline - -- NOTE: Need to add to wezterm config https://github.com/folke/zen-mode.nvim#wezterm - wezterm = { - enabled = false, - font = "+1", -- +1 font size or fixed size, e.g. 21 - }, - }, - }, - config = true, - keys = { - -- add cz to enter zen mode - { - "cz", - "ZenMode", - desc = "Distraction Free Mode", - }, - }, - }, -} -- cgit v1.2.3