add mini.nvim plugins
This commit is contained in:
parent
93027a59a2
commit
452641f58c
9 changed files with 207 additions and 134 deletions
|
|
@ -8,18 +8,16 @@ vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'",
|
||||||
{ desc = "Move cursor regardless of word wrap", expr = true, silent = true })
|
{ desc = "Move cursor regardless of word wrap", expr = true, silent = true })
|
||||||
vim.keymap.set("n", "J", "mzJ`z", { desc = "Keep cursor in column while joining lines", silent = true })
|
vim.keymap.set("n", "J", "mzJ`z", { desc = "Keep cursor in column while joining lines", silent = true })
|
||||||
|
|
||||||
vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "Keep cursor centered while junping", silent = true })
|
-- vim.keymap.set("n", "<C-d>", "<C-d>zz", { desc = "Keep cursor centered while junping", silent = true })
|
||||||
vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "Keep cursor centered while junping", silent = true })
|
-- vim.keymap.set("n", "<C-u>", "<C-u>zz", { desc = "Keep cursor centered while junping", silent = true })
|
||||||
vim.keymap.set("n", "n", "nzzzv", { desc = "Keep cursor centered while searching", silent = true })
|
-- vim.keymap.set("n", "n", "nzzzv", { desc = "Keep cursor centered while searching", silent = true })
|
||||||
vim.keymap.set("n", "N", "Nzzzv", { desc = "Keep cursor centered while searching", silent = true })
|
-- vim.keymap.set("n", "N", "Nzzzv", { desc = "Keep cursor centered while searching", silent = true })
|
||||||
|
|
||||||
-- Utils
|
-- Utils
|
||||||
vim.keymap.set("n", "|", ":vs<CR>", { desc = "Create vsplit", silent = true })
|
vim.keymap.set("n", "|", ":vs<CR>", { desc = "Create vsplit", silent = true })
|
||||||
vim.keymap.set("n", "°", ":sp<CR>", { desc = "Create split", silent = true })
|
vim.keymap.set("n", "°", ":sp<CR>", { desc = "Create split", silent = true })
|
||||||
|
|
||||||
vim.keymap.set("v", "p", [["_dP]], { desc = "Paste without lossing yanked text", silent = true })
|
vim.keymap.set("v", "p", [["_dP]], { desc = "Paste without lossing yanked text", silent = true })
|
||||||
vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move selection down", silent = true })
|
|
||||||
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move selection up", silent = true })
|
|
||||||
vim.keymap.set("n", "<Leader>uh", ":nohl<CR>", { desc = "Remove search highlight", silent = true })
|
vim.keymap.set("n", "<Leader>uh", ":nohl<CR>", { desc = "Remove search highlight", silent = true })
|
||||||
|
|
||||||
-- Buffer manipulation
|
-- Buffer manipulation
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,10 @@ return { -- Change colors.none if not using a transparent background
|
||||||
mason = true,
|
mason = true,
|
||||||
noice = true,
|
noice = true,
|
||||||
notify = true,
|
notify = true,
|
||||||
|
mini = {
|
||||||
|
enabled = true,
|
||||||
|
indentscope_color = "",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
custom_highlights = function(colors)
|
custom_highlights = function(colors)
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
|
|
@ -9,16 +9,4 @@ return {
|
||||||
{ "gcl", function() require("comment-box").llline() end, { desc = "Create a comment line", mode = { "n", "v" }, } },
|
{ "gcl", function() require("comment-box").llline() end, { desc = "Create a comment line", mode = { "n", "v" }, } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"folke/todo-comments.nvim",
|
|
||||||
cmd = { "TodoTrouble", "TodoTelescope" },
|
|
||||||
event = { "BufReadPost", "BufNewFile" },
|
|
||||||
config = true,
|
|
||||||
keys = {
|
|
||||||
{ "]t", function() require("todo-comments").jump_next() end, desc = "Next todo comment" },
|
|
||||||
{ "[t", function() require("todo-comments").jump_prev() end, desc = "Previous todo comment" },
|
|
||||||
{ "<leader>ft", "<cmd>TodoTrouble<cr>", desc = "Find todos (Trouble)" },
|
|
||||||
{ "<leader>fT", "<cmd>TodoTelescope<cr>", desc = "Find todos (Telescope)" },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,16 @@ return {
|
||||||
"mikavilpas/yazi.nvim",
|
"mikavilpas/yazi.nvim",
|
||||||
keys = {
|
keys = {
|
||||||
{
|
{
|
||||||
"<leader>e",
|
"<leader>E",
|
||||||
"<cmd>Yazi<cr>",
|
"<cmd>Yazi<cr>",
|
||||||
desc = "Open yazi at the current file",
|
desc = "Open yazi at the current file",
|
||||||
},
|
},
|
||||||
{
|
-- {
|
||||||
-- Open in the current working directory
|
-- -- Open in the current working directory
|
||||||
"<leader>E",
|
-- "<leader>E",
|
||||||
"<cmd>Yazi cwd<cr>",
|
-- "<cmd>Yazi cwd<cr>",
|
||||||
desc = "Open the file manager in nvim's working directory",
|
-- desc = "Open the file manager in nvim's working directory",
|
||||||
},
|
-- },
|
||||||
},
|
},
|
||||||
opts = {
|
opts = {
|
||||||
-- if you want to open yazi instead of netrw, see below for more info
|
-- if you want to open yazi instead of netrw, see below for more info
|
||||||
|
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
local const = require("aleidk.constants")
|
|
||||||
|
|
||||||
return {
|
|
||||||
{
|
|
||||||
"lewis6991/gitsigns.nvim",
|
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
|
||||||
opts = {
|
|
||||||
-- See `:help gitsigns.txt`
|
|
||||||
signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
|
|
||||||
numhl = true, -- Toggle with `:Gitsigns toggle_numhl`
|
|
||||||
linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
|
|
||||||
word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
|
|
||||||
signs = {
|
|
||||||
add = { text = const.icons.git.added },
|
|
||||||
change = { text = const.icons.git.modified },
|
|
||||||
delete = { text = const.icons.git.removed },
|
|
||||||
topdelete = { text = const.icons.git.removed },
|
|
||||||
changedelete = { text = const.icons.git.removed },
|
|
||||||
untracked = { text = "▎" },
|
|
||||||
},
|
|
||||||
signs_staged = {
|
|
||||||
add = { text = const.icons.git.added },
|
|
||||||
change = { text = const.icons.git.modified },
|
|
||||||
delete = { text = const.icons.git.removed },
|
|
||||||
topdelete = { text = const.icons.git.removed },
|
|
||||||
changedelete = { text = const.icons.git.removed },
|
|
||||||
untracked = { text = "▎" },
|
|
||||||
},
|
|
||||||
on_attach = function(buffer)
|
|
||||||
local gs = package.loaded.gitsigns
|
|
||||||
|
|
||||||
local function map(mode, l, r, desc)
|
|
||||||
vim.keymap.set(mode, "<leader>g" .. l, r, { buffer = buffer, desc = desc })
|
|
||||||
end
|
|
||||||
|
|
||||||
-- stylua: ignore start
|
|
||||||
map("n", "j", gs.next_hunk, "Next Hunk")
|
|
||||||
map("n", "k", gs.prev_hunk, "Prev Hunk")
|
|
||||||
map({ "n", "v" }, "s", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
|
|
||||||
map({ "n", "v" }, "r", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
|
|
||||||
map("n", "u", gs.undo_stage_hunk, "Undo Stage Hunk")
|
|
||||||
map("n", "R", gs.reset_buffer, "Reset Buffer")
|
|
||||||
map("n", "<TAB>", gs.preview_hunk, "Preview Hunk")
|
|
||||||
map("n", "l", function() gs.blame_line({ full = true }) end, "Blame Line")
|
|
||||||
map("n", "L", gs.toggle_current_line_blame, "Toggle current line blame")
|
|
||||||
map("n", "d", gs.toggle_word_diff, "Toggle word diff")
|
|
||||||
map("n", "h", "<CMD>diffget<CR>", "Diff This with last commit")
|
|
||||||
map("n", "l", "<CMD>diffput<CR>", "Diff This with last commit")
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
@ -1,23 +1,6 @@
|
||||||
return {
|
return {
|
||||||
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
|
'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
|
||||||
{ "nvim-tree/nvim-web-devicons", lazy = true },
|
{ "nvim-tree/nvim-web-devicons", lazy = true },
|
||||||
{
|
|
||||||
-- Highlight word under cursor
|
|
||||||
"RRethy/vim-illuminate",
|
|
||||||
event = { "BufReadPost", "BufNewFile" },
|
|
||||||
opts = {
|
|
||||||
delay = 200,
|
|
||||||
filetypes_denylist = {
|
|
||||||
'dirbuf',
|
|
||||||
'dirvish',
|
|
||||||
'fugitive',
|
|
||||||
'aerial',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
config = function(_, opts)
|
|
||||||
require("illuminate").configure(opts)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"ckolkey/ts-node-action",
|
"ckolkey/ts-node-action",
|
||||||
dependencies = { "nvim-treesitter" },
|
dependencies = { "nvim-treesitter" },
|
||||||
|
|
@ -26,17 +9,4 @@ return {
|
||||||
{ "<leader>ls", function() require("ts-node-action").node_action() end, desc = "Node Action" }
|
{ "<leader>ls", function() require("ts-node-action").node_action() end, desc = "Node Action" }
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"Wansmer/treesj",
|
|
||||||
cmd = { "TSJToggle" },
|
|
||||||
keys = {
|
|
||||||
{ "<leader>lm", "<CMD>TSJToggle<CR>", desc = "Toggle treesitter join" },
|
|
||||||
},
|
|
||||||
dependencies = { "nvim-treesitter/nvim-treesitter" },
|
|
||||||
opts = {
|
|
||||||
use_default_keymaps = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
return {
|
|
||||||
"L3MON4D3/LuaSnip",
|
|
||||||
dependencies = {
|
|
||||||
"rafamadriz/friendly-snippets",
|
|
||||||
config = function()
|
|
||||||
require("luasnip.loaders.from_vscode").lazy_load()
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
opts = {
|
|
||||||
history = true,
|
|
||||||
delete_check_events = "TextChanged",
|
|
||||||
},
|
|
||||||
-- stylua: ignore
|
|
||||||
keys = {
|
|
||||||
{
|
|
||||||
"<tab>",
|
|
||||||
function()
|
|
||||||
return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>"
|
|
||||||
end,
|
|
||||||
expr = true,
|
|
||||||
silent = true,
|
|
||||||
mode = "i",
|
|
||||||
},
|
|
||||||
{ "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
|
|
||||||
{ "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
|
|
||||||
},
|
|
||||||
}
|
|
||||||
181
config/nvim_unstable/lua/aleidk/plugins/mini.lua
Normal file
181
config/nvim_unstable/lua/aleidk/plugins/mini.lua
Normal file
|
|
@ -0,0 +1,181 @@
|
||||||
|
return {
|
||||||
|
'echasnovski/mini.nvim',
|
||||||
|
version = '*',
|
||||||
|
dependencies = {
|
||||||
|
"rafamadriz/friendly-snippets",
|
||||||
|
},
|
||||||
|
config = function()
|
||||||
|
require('mini.icons').setup()
|
||||||
|
require('mini.bracketed').setup() -- [] movement for various stuff
|
||||||
|
require("mini.ai").setup({})
|
||||||
|
require('mini.cursorword').setup() -- Highlight word under cursor
|
||||||
|
require('mini.extra').setup()
|
||||||
|
require('mini.jump').setup() -- Extend f, F, t, T
|
||||||
|
require('mini.surround').setup()
|
||||||
|
require('mini.operators').setup()
|
||||||
|
require('mini.pairs').setup()
|
||||||
|
require('mini.splitjoin').setup()
|
||||||
|
require("mini.align").setup({})
|
||||||
|
require('mini.animate').setup()
|
||||||
|
require('mini.notify').setup()
|
||||||
|
require('mini.starter').setup()
|
||||||
|
require('mini.statusline').setup({})
|
||||||
|
require('mini.diff').setup({ view = { style = 'sign' } })
|
||||||
|
|
||||||
|
require('mini.git').setup({})
|
||||||
|
|
||||||
|
local rhs = '<Cmd>lua MiniGit.show_at_cursor()<CR>'
|
||||||
|
vim.keymap.set({ 'n', 'x' }, '<Leader>gs', rhs, { desc = 'Show at cursor' })
|
||||||
|
|
||||||
|
local starter = require('mini.starter')
|
||||||
|
starter.setup({
|
||||||
|
footer = '',
|
||||||
|
evaluate_single = true,
|
||||||
|
items = {
|
||||||
|
starter.sections.recent_files(10, true),
|
||||||
|
starter.sections.pick(),
|
||||||
|
starter.sections.builtin_actions(),
|
||||||
|
},
|
||||||
|
content_hooks = {
|
||||||
|
starter.gen_hook.adding_bullet(),
|
||||||
|
starter.gen_hook.indexing('all', { 'Builtin actions' }),
|
||||||
|
starter.gen_hook.aligning("center", "center"),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
require('mini.indentscope').setup({
|
||||||
|
draw = {
|
||||||
|
animation = require('mini.indentscope').gen_animation.none(),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
require('mini.move').setup({
|
||||||
|
mappings = {
|
||||||
|
-- Move visual selection in Visual mode
|
||||||
|
left = 'H',
|
||||||
|
right = 'L',
|
||||||
|
down = 'J',
|
||||||
|
up = 'K',
|
||||||
|
|
||||||
|
-- Move current line in Normal mode
|
||||||
|
line_left = '',
|
||||||
|
line_right = '',
|
||||||
|
line_down = '',
|
||||||
|
line_up = '',
|
||||||
|
},
|
||||||
|
})
|
||||||
|
require('mini.comment').setup({
|
||||||
|
options = {
|
||||||
|
-- Whether to ignore blank lines when commenting
|
||||||
|
ignore_blank_line = true,
|
||||||
|
-- Whether to ignore blank lines in actions and textobject
|
||||||
|
start_of_line = true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
local gen_loader = require('mini.snippets').gen_loader
|
||||||
|
require('mini.snippets').setup({
|
||||||
|
snippets = {
|
||||||
|
-- Load custom file with global snippets first (adjust for Windows)
|
||||||
|
gen_loader.from_file('~/.config/nvim-unstable/snippets/global.json'),
|
||||||
|
|
||||||
|
-- Load snippets based on current language by reading files from
|
||||||
|
-- "snippets/" subdirectories from 'runtimepath' directories.
|
||||||
|
gen_loader.from_lang(),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
local miniclue = require("mini.clue")
|
||||||
|
miniclue.setup({
|
||||||
|
triggers = {
|
||||||
|
-- Leader triggers
|
||||||
|
{ mode = "n", keys = "<Leader>" },
|
||||||
|
{ mode = "v", keys = "<Leader>" },
|
||||||
|
{ mode = "x", keys = "<Leader>" },
|
||||||
|
|
||||||
|
-- Built-in completion
|
||||||
|
{ mode = "i", keys = "<C-x>" },
|
||||||
|
|
||||||
|
-- `g` key
|
||||||
|
{ mode = "n", keys = "g" },
|
||||||
|
{ mode = "x", keys = "g" },
|
||||||
|
|
||||||
|
-- Marks
|
||||||
|
{ mode = "n", keys = "'" },
|
||||||
|
{ mode = "n", keys = "`" },
|
||||||
|
{ mode = "x", keys = "'" },
|
||||||
|
{ mode = "x", keys = "`" },
|
||||||
|
|
||||||
|
-- Registers
|
||||||
|
{ mode = "n", keys = '"' },
|
||||||
|
{ mode = "x", keys = '"' },
|
||||||
|
{ mode = "i", keys = "<C-r>" },
|
||||||
|
{ mode = "c", keys = "<C-r>" },
|
||||||
|
|
||||||
|
-- Window commands
|
||||||
|
{ mode = "n", keys = "<C-w>" },
|
||||||
|
|
||||||
|
-- `z` key
|
||||||
|
{ mode = "n", keys = "z" },
|
||||||
|
{ mode = "x", keys = "z" },
|
||||||
|
},
|
||||||
|
|
||||||
|
-- Add a "postkeys" value to activate those keys after others
|
||||||
|
clues = {
|
||||||
|
miniclue.gen_clues.builtin_completion(),
|
||||||
|
miniclue.gen_clues.g(),
|
||||||
|
miniclue.gen_clues.marks(),
|
||||||
|
miniclue.gen_clues.registers(),
|
||||||
|
miniclue.gen_clues.windows(),
|
||||||
|
miniclue.gen_clues.z(),
|
||||||
|
|
||||||
|
{ mode = "n", keys = "<Leader><Leader>", desc = "+Bookmarks" },
|
||||||
|
{ mode = "n", keys = "<Leader><Leader>n", postkeys = "<Leader><Leader>" },
|
||||||
|
{ mode = "n", keys = "<Leader><Leader>N", postkeys = "<Leader><Leader>" },
|
||||||
|
{ mode = "n", keys = "<Leader>b", desc = "+Buffers" },
|
||||||
|
{ mode = "n", keys = "<Leader>bh", postkeys = "<Leader>b" },
|
||||||
|
{ mode = "n", keys = "<Leader>bl", postkeys = "<Leader>b" },
|
||||||
|
{ mode = "n", keys = "<Leader>f", desc = "+Find" },
|
||||||
|
{ mode = "n", keys = "<Leader>g", desc = "+Git" },
|
||||||
|
{ mode = "n", keys = "<Leader>l", desc = "+LSP" },
|
||||||
|
{ mode = "n", keys = "<Leader>r", desc = "+Replace" },
|
||||||
|
{ mode = "n", keys = "<Leader>u", desc = "+UI & Config" },
|
||||||
|
{ mode = "n", keys = "<Leader>un", desc = "+Noice" },
|
||||||
|
{ mode = "n", keys = "<Leader>w", desc = "+Workspace" },
|
||||||
|
{ mode = "n", keys = "<Leader>p", desc = "+Run stuff" },
|
||||||
|
{ mode = "n", keys = "<Leader>z", desc = "+ZK" },
|
||||||
|
{ mode = "v", keys = "<Leader>z", desc = "+ZK" },
|
||||||
|
{ mode = "v", keys = "<Leader>a", desc = "+AI" },
|
||||||
|
{ mode = "n", keys = "<Leader>a", desc = "+AI" },
|
||||||
|
{ mode = "n", keys = "g?", desc = "+Print Debug" },
|
||||||
|
},
|
||||||
|
|
||||||
|
-- Clue window settings
|
||||||
|
window = {
|
||||||
|
-- Floating window config
|
||||||
|
config = {
|
||||||
|
width = "auto",
|
||||||
|
},
|
||||||
|
-- Delay before showing clue window
|
||||||
|
delay = 200,
|
||||||
|
-- Keys to scroll inside the clue window
|
||||||
|
scroll_down = "<C-d>",
|
||||||
|
scroll_up = "<C-u>",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
local hipatterns = require('mini.hipatterns')
|
||||||
|
hipatterns.setup({
|
||||||
|
highlighters = {
|
||||||
|
-- Highlight standalone 'FIXME', 'HACK', 'TODO', 'NOTE'
|
||||||
|
fixme = { pattern = '%f[%w]()FIXME()%f[%W]', group = 'MiniHipatternsFixme' },
|
||||||
|
hack = { pattern = '%f[%w]()HACK()%f[%W]', group = 'MiniHipatternsHack' },
|
||||||
|
todo = { pattern = '%f[%w]()TODO()%f[%W]', group = 'MiniHipatternsTodo' },
|
||||||
|
note = { pattern = '%f[%w]()NOTE()%f[%W]', group = 'MiniHipatternsNote' },
|
||||||
|
|
||||||
|
-- Highlight hex color strings (`#rrggbb`) using that color
|
||||||
|
hex_color = hipatterns.gen_highlighter.hex_color(),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
}
|
||||||
11
config/nvim_unstable/snippets/global.json
Normal file
11
config/nvim_unstable/snippets/global.json
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
{
|
||||||
|
"Basic": { "prefix": "ba", "body": "T1=$1 T2=$2 T0=$0" },
|
||||||
|
"Placeholders": { "prefix": "pl", "body": "T1=${1:aa}\nT2=${2:<$1>}" },
|
||||||
|
"Choices": { "prefix": "ch", "body": "T1=${1|a,b|} T2=${2|c,d|}" },
|
||||||
|
"Linked": { "prefix": "li", "body": "T1=$1\n\tT1=$1" },
|
||||||
|
"Variables": { "prefix": "va", "body": "Runtime: $VIMRUNTIME\n" },
|
||||||
|
"Complex": {
|
||||||
|
"prefix": "co",
|
||||||
|
"body": ["T1=${1:$RANDOM}", "T3=${3:$1_${2:$1}}", "T2=$2"]
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue