update some plugin configuration

This commit is contained in:
Alexander Navarro 2024-11-22 12:52:48 -03:00
parent 82a3427e1b
commit ec617fabc2
6 changed files with 54 additions and 29 deletions

View file

@ -1,7 +1,7 @@
return {
-- Add indentation guides even on blank lines
"lukas-reineke/indent-blankline.nvim",
event = { "BufReadPost", "BufNewFile" },
dependencies = { "nvim-treesitter/nvim-treesitter" },
main = "ibl",
opts = {
-- char = "▏",

View file

@ -36,30 +36,24 @@ return {
move = {
enable = true,
set_jumps = true, -- whether to set jumps in the jumplist
goto_next_start = {
["]m"] = "@function.outer",
["]]"] = "@class.outer",
goto_previous = { -- current or last start of object
["[["] = { query = "@local.scope", query_group = "locals", desc = "Next scope" },
["[f"] = "@function.outer",
["[c"] = "@class.outer",
},
goto_next_end = {
["]M"] = "@function.outer",
["]["] = "@class.outer",
},
goto_previous_start = {
["[m"] = "@function.outer",
["[["] = "@class.outer",
},
goto_previous_end = {
["[M"] = "@function.outer",
["[]"] = "@class.outer",
goto_next = { -- next object end
["]]"] = { query = "@local.scope", query_group = "locals", desc = "Next scope" },
["]f"] = "@function.outer", -- current function end
["]c"] = "@class.outer",
},
},
swap = {
enable = true,
swap_next = {
["<leader>a"] = "@parameter.inner",
["<leader>ln"] = "@parameter.inner",
},
swap_previous = {
["<leader>A"] = "@parameter.inner",
["<leader>lN"] = "@parameter.inner",
},
},
},
@ -70,6 +64,23 @@ return {
enable_autocmd = false,
}
local ts_repeat_move = require "nvim-treesitter.textobjects.repeatable_move"
-- Repeat movement with ; and ,
-- ensure , goes forward and ; goes backward regardless of the last direction
vim.keymap.set({ "n", "x", "o" }, ",", ts_repeat_move.repeat_last_move_next)
vim.keymap.set({ "n", "x", "o" }, ";", ts_repeat_move.repeat_last_move_previous)
-- Optionally, make builtin f, F, t, T also repeatable with ; and ,
vim.keymap.set({ "n", "x", "o" }, "f", ts_repeat_move.builtin_f_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "F", ts_repeat_move.builtin_F_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "t", ts_repeat_move.builtin_t_expr, { expr = true })
vim.keymap.set({ "n", "x", "o" }, "T", ts_repeat_move.builtin_T_expr, { expr = true })
vim.keymap.set("n", "[u", function()
require("treesitter-context").go_to_context()
end, { silent = true, noremap = true, desc = "Go up when context is out of view" })
vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"

View file

@ -42,12 +42,26 @@ return {
},
routes = {
{
filter = {
event = "msg_show",
kind = "",
find = "written",
},
-- Don't show these messages
opts = { skip = true },
filter = {
any = {
{
event = "msg_show",
kind = "search_count",
},
{
event = "msg_show",
kind = "",
find = "written",
},
{
event = "msg_show",
kind = "",
find = "yazi.nvim",
},
}
},
},
{
filter = {

View file

@ -1,7 +1,7 @@
return { -- Change colors.none if not using a transparent background
"catppuccin/nvim",
name = "catppuccin",
priority = 1000,
lazy = false,
opts = {
flavour = "macchiato",
transparent_background = true,
@ -13,10 +13,10 @@ return { -- Change colors.none if not using a transparent background
mason = true,
neogit = true,
noice = true,
hop = true,
lsp_trouble = true,
indent_blankline = {
enabled = true,
scope_color = "text",
},
},
custom_highlights = function(colors)
@ -35,6 +35,6 @@ return { -- Change colors.none if not using a transparent background
config = function(_, opts)
require("catppuccin").setup(opts)
vim.cmd.colorscheme("catppuccin")
vim.cmd.colorscheme("catppuccin-macchiato")
end,
}

View file

@ -245,8 +245,8 @@ return { {
},
keys = {
{ "<leader>lt", function() require("aerial").toggle() end, desc = "Open syntax tree" },
{ "<leader>lT", function() require("aerial").nav_toggle() end, desc = "Open syntax tree navigation" },
{ "<leader>ll", function() require("aerial").toggle() end, desc = "Open syntax tree" },
{ "<leader>lL", function() require("aerial").nav_toggle() end, desc = "Open syntax tree navigation" },
{ "<leader>fl", "<CMD>Telescope aerial<CR>", desc = "Find in syntax tree" },
}
}