From 0b90092ff8c38f341ccb3c7dadef65069508f254 Mon Sep 17 00:00:00 2001 From: Job79 Date: Wed, 24 Jun 2026 20:34:11 +0200 Subject: [PATCH] refactor: temp --- lua/just.lua | 39 ++ lua/terminal.lua | 13 + plugin/20_keymaps.lua | 342 +++++------------ plugin/30_mini.lua | 837 ++++-------------------------------------- plugin/40_plugins.lua | 224 +++++------ 5 files changed, 321 insertions(+), 1134 deletions(-) create mode 100644 lua/just.lua create mode 100644 lua/terminal.lua diff --git a/lua/just.lua b/lua/just.lua new file mode 100644 index 0000000..e0f8f2e --- /dev/null +++ b/lua/just.lua @@ -0,0 +1,39 @@ +local function run_task(cmd) + local buf = vim.api.nvim_create_buf(true, true) + vim.api.nvim_buf_set_name(buf, "just://" .. cmd) + vim.notify("󰑮 Running: " .. cmd) + + vim.api.nvim_buf_call(buf, function() + vim.fn.jobstart(cmd, { + term = true, + on_exit = function(_, code) + if code == 0 then + vim.notify("󰄬 " .. cmd .. " success") + vim.schedule(function() + pcall(vim.api.nvim_buf_delete, buf, { force = true }) + end) + else + vim.notify("󰅚 " .. cmd .. " failed (" .. code .. ")", 4) + end + end, + }) + end) +end + +function pick_just_task() + local obj = vim.system({ "just", "--summary" }, { text = true }):wait() + if obj.code ~= 0 or not obj.stdout or obj.stdout == "" then + return vim.notify("No recipes or justfile found", 3) + end + + local recipes = vim.split(vim.trim(obj.stdout), "%s+") + require("mini.pick").start({ + source = { + items = recipes, + name = "󱁤 Just Tasks", + choose = function(choice) + run_task("just " .. choice) + end, + }, + }) +end diff --git a/lua/terminal.lua b/lua/terminal.lua new file mode 100644 index 0000000..036e593 --- /dev/null +++ b/lua/terminal.lua @@ -0,0 +1,13 @@ +local M = {} + +--- Opens a TUI application in a new scratch buffer and deletes the buffer on exit. +function M.open_terminal_app(cmd) + vim.cmd("enew") + vim.fn.termopen(cmd, { + on_exit = function() + vim.cmd("bdelete!") + end, + }) +end + +return M diff --git a/plugin/20_keymaps.lua b/plugin/20_keymaps.lua index 31fdb47..2615bf3 100644 --- a/plugin/20_keymaps.lua +++ b/plugin/20_keymaps.lua @@ -1,249 +1,109 @@ --- ┌─────────────────┐ --- │ Custom mappings │ --- └─────────────────┘ --- --- This file contains definitions of custom general and Leader mappings. - --- General mappings =========================================================== - --- Use this section to add custom general mappings. See `:h vim.keymap.set()`. - --- An example helper to create a Normal mode mapping -local nmap = function(lhs, rhs, desc) - -- See `:h vim.keymap.set()` - vim.keymap.set('n', lhs, rhs, { desc = desc }) -end - --- Paste linewise before/after current line --- Usage: `yiw` to yank a word and `]p` to put it on the next line. -nmap('[p', 'exe "iput! " . v:register', 'Paste Above') -nmap(']p', 'exe "iput " . v:register', 'Paste Below') - --- Many general mappings are created by 'mini.basics'. See 'plugin/30_mini.lua' - --- stylua: ignore start --- The next part (until `-- stylua: ignore end`) is aligned manually for easier --- reading. Consider preserving this or remove `-- stylua` lines to autoformat. - --- Leader mappings ============================================================ - --- Neovim has the concept of a Leader key (see `:h `). It is a configurable --- key that is primarily used for "workflow" mappings (opposed to text editing). --- Like "open file explorer", "create scratch buffer", "pick from buffers". --- --- In 'plugin/10_options.lua' is set to , i.e. press --- whenever there is a suggestion to press . --- --- This config uses a "two key Leader mappings" approach: first key describes --- semantic group, second key executes an action. Both keys are usually chosen --- to create some kind of mnemonic. --- Example: `f` groups "find" type of actions; `ff` - find files. --- Use this section to add Leader mappings in a structural manner. --- --- Usually if there are global and local kinds of actions, lowercase second key --- denotes global and uppercase - local. --- Example: `fs` / `fS` - find workspace/document LSP symbols. --- --- Many of the mappings use 'mini.nvim' modules set up in 'plugin/30_mini.lua'. - --- Create a global table with information about Leader groups in certain modes. --- This is used to provide 'mini.clue' with extra clues. --- Add an entry if you create a new group. +-- Clues ======================================================================= Config.leader_group_clues = { - { mode = 'n', keys = 'b', desc = '+Buffer' }, - { mode = 'n', keys = 'e', desc = '+Explore/Edit' }, - { mode = 'n', keys = 'f', desc = '+Find' }, - { mode = 'n', keys = 'g', desc = '+Git' }, - { mode = 'n', keys = 'l', desc = '+Language' }, - { mode = 'n', keys = 'm', desc = '+Map' }, - { mode = 'n', keys = 'o', desc = '+Other' }, - { mode = 'n', keys = 's', desc = '+Session' }, - { mode = 'n', keys = 't', desc = '+Terminal' }, - { mode = 'n', keys = 'v', desc = '+Visits' }, - - { mode = 'x', keys = 'g', desc = '+Git' }, - { mode = 'x', keys = 'l', desc = '+Language' }, + { mode = "n", keys = "a", desc = "+AI" }, + { mode = "n", keys = "b", desc = "+Buffer" }, + { mode = "n", keys = "d", desc = "+Debug" }, + { mode = "n", keys = "e", desc = "+Explore" }, + { mode = "n", keys = "f", desc = "+Find" }, + { mode = "n", keys = "g", desc = "+Git" }, + { mode = "n", keys = "h", desc = "+Http" }, + { mode = "n", keys = "l", desc = "+Language" }, + { mode = "n", keys = "r", desc = "+Run" }, + { mode = "n", keys = "s", desc = "+Session" }, + { mode = "n", keys = "t", desc = "+Terminal" }, + { mode = "x", keys = "g", desc = "+Git" }, + { mode = "x", keys = "l", desc = "+Language" }, } --- Helpers for a more concise `` mappings. --- Most of the mappings use `...` string as a right hand side (RHS) in --- an attempt to be more concise yet descriptive. See `:h `. --- This approach also doesn't require the underlying commands/functions to exist --- during mapping creation: a "lazy loading" approach to improve startup time. -local nmap_leader = function(suffix, rhs, desc) - vim.keymap.set('n', '' .. suffix, rhs, { desc = desc }) -end -local xmap_leader = function(suffix, rhs, desc) - vim.keymap.set('x', '' .. suffix, rhs, { desc = desc }) -end +-- Helpers ===================================================================== +local nmap = function(lhs, rhs, desc) vim.keymap.set("n", lhs, rhs, { desc = desc }) end +local nmap_leader = function(suffix, rhs, desc) vim.keymap.set("n", "" .. suffix, rhs, { desc = desc }) end +local xmap_leader = function(suffix, rhs, desc) vim.keymap.set("x", "" .. suffix, rhs, { desc = desc }) end --- b is for 'Buffer'. Common usage: --- - `bs` - create scratch (temporary) buffer --- - `ba` - navigate to the alternative buffer --- - `bw` - wipeout (fully delete) current buffer -local new_scratch_buffer = function() - vim.api.nvim_win_set_buf(0, vim.api.nvim_create_buf(true, true)) -end - -nmap_leader('ba', 'b#', 'Alternate') -nmap_leader('bd', 'lua MiniBufremove.delete()', 'Delete') -nmap_leader('bD', 'lua MiniBufremove.delete(0, true)', 'Delete!') -nmap_leader('bs', new_scratch_buffer, 'Scratch') -nmap_leader('bw', 'lua MiniBufremove.wipeout()', 'Wipeout') -nmap_leader('bW', 'lua MiniBufremove.wipeout(0, true)', 'Wipeout!') - --- e is for 'Explore' and 'Edit'. Common usage: --- - `ed` - open explorer at current working directory --- - `ef` - open directory of current file (needs to be present on disk) --- - `ei` - edit 'init.lua' --- - All mappings that use `edit_plugin_file` - edit 'plugin/' config files -local edit_plugin_file = function(filename) - return string.format('edit %s/plugin/%s', vim.fn.stdpath('config'), filename) -end -local explore_at_file = 'lua MiniFiles.open(vim.api.nvim_buf_get_name(0))' -local explore_quickfix = function() - vim.cmd(vim.fn.getqflist({ winid = true }).winid ~= 0 and 'cclose' or 'copen') -end -local explore_locations = function() - vim.cmd(vim.fn.getloclist(0, { winid = true }).winid ~= 0 and 'lclose' or 'lopen') -end - -nmap_leader('ed', 'lua MiniFiles.open()', 'Directory') -nmap_leader('ef', explore_at_file, 'File directory') -nmap_leader('ei', 'edit $MYVIMRC', 'init.lua') -nmap_leader('ek', edit_plugin_file('20_keymaps.lua'), 'Keymaps config') -nmap_leader('em', edit_plugin_file('30_mini.lua'), 'MINI config') -nmap_leader('en', 'lua MiniNotify.show_history()', 'Notifications') -nmap_leader('eo', edit_plugin_file('10_options.lua'), 'Options config') -nmap_leader('ep', edit_plugin_file('40_plugins.lua'), 'Plugins config') -nmap_leader('eq', explore_quickfix, 'Quickfix list') -nmap_leader('eQ', explore_locations, 'Location list') - --- f is for 'Fuzzy Find'. Common usage: --- - `ff` - find files; for best performance requires `ripgrep` --- - `fg` - find inside files; requires `ripgrep` --- - `fh` - find help tag --- - `fr` - resume latest picker --- - `fv` - all visited paths; requires 'mini.visits' --- --- All these use 'mini.pick'. See `:h MiniPick-overview` for an overview. -local pick_added_hunks_buf = 'Pick git_hunks path="%" scope="staged"' -local pick_workspace_symbols_live = 'Pick lsp scope="workspace_symbol_live"' - -nmap_leader('f/', 'Pick history scope="/"', '"/" history') -nmap_leader('f:', 'Pick history scope=":"', '":" history') -nmap_leader('fa', 'Pick git_hunks scope="staged"', 'Added hunks (all)') -nmap_leader('fA', pick_added_hunks_buf, 'Added hunks (buf)') -nmap_leader('fb', 'Pick buffers', 'Buffers') -nmap_leader('fc', 'Pick git_commits', 'Commits (all)') -nmap_leader('fC', 'Pick git_commits path="%"', 'Commits (buf)') -nmap_leader('fd', 'Pick diagnostic scope="all"', 'Diagnostic workspace') -nmap_leader('fD', 'Pick diagnostic scope="current"', 'Diagnostic buffer') -nmap_leader('ff', 'Pick files', 'Files') -nmap_leader('fg', 'Pick grep_live', 'Grep live') -nmap_leader('fG', 'Pick grep pattern=""', 'Grep current word') -nmap_leader('fh', 'Pick help', 'Help tags') -nmap_leader('fH', 'Pick hl_groups', 'Highlight groups') -nmap_leader('fl', 'Pick buf_lines scope="all"', 'Lines (all)') -nmap_leader('fL', 'Pick buf_lines scope="current"', 'Lines (buf)') -nmap_leader('fm', 'Pick git_hunks', 'Modified hunks (all)') -nmap_leader('fM', 'Pick git_hunks path="%"', 'Modified hunks (buf)') -nmap_leader('fr', 'Pick resume', 'Resume') -nmap_leader('fR', 'Pick lsp scope="references"', 'References (LSP)') -nmap_leader('fs', pick_workspace_symbols_live, 'Symbols workspace (live)') -nmap_leader('fS', 'Pick lsp scope="document_symbol"', 'Symbols document') -nmap_leader('fv', 'Pick visit_paths cwd=""', 'Visit paths (all)') -nmap_leader('fV', 'Pick visit_paths', 'Visit paths (cwd)') - --- g is for 'Git'. Common usage: --- - `gs` - show information at cursor --- - `go` - toggle 'mini.diff' overlay to show in-buffer unstaged changes --- - `gd` - show unstaged changes as a patch in separate tabpage --- - `gL` - show Git log of current file -local git_log_cmd = [[Git log --pretty=format:\%h\ \%as\ │\ \%s --topo-order]] -local git_log_buf_cmd = git_log_cmd .. ' --follow -- %' - -nmap_leader('ga', 'Git diff --cached', 'Added diff') -nmap_leader('gA', 'Git diff --cached -- %', 'Added diff buffer') -nmap_leader('gc', 'Git commit', 'Commit') -nmap_leader('gC', 'Git commit --amend', 'Commit amend') -nmap_leader('gd', 'Git diff', 'Diff') -nmap_leader('gD', 'Git diff -- %', 'Diff buffer') -nmap_leader('gl', '' .. git_log_cmd .. '', 'Log') -nmap_leader('gL', '' .. git_log_buf_cmd .. '', 'Log buffer') -nmap_leader('go', 'lua MiniDiff.toggle_overlay()', 'Toggle overlay') -nmap_leader('gs', 'lua MiniGit.show_at_cursor()', 'Show at cursor') - -xmap_leader('gs', 'lua MiniGit.show_at_cursor()', 'Show at selection') - --- l is for 'Language'. Common usage: --- - `ld` - show more diagnostic details in a floating window --- - `lr` - perform rename via LSP --- - `ls` - navigate to source definition of symbol under cursor --- --- NOTE: most LSP mappings represent a more structured way of replacing built-in --- LSP mappings (like `:h gra` and others). This is needed because `gr` is mapped --- by an "replace" operator in 'mini.operators' (which is more commonly used). -nmap_leader('la', 'lua vim.lsp.buf.code_action()', 'Actions') -nmap_leader('ld', 'lua vim.diagnostic.open_float()', 'Diagnostic popup') -nmap_leader('lf', 'lua require("conform").format()', 'Format') -nmap_leader('li', 'lua vim.lsp.buf.implementation()', 'Implementation') -nmap_leader('lh', 'lua vim.lsp.buf.hover()', 'Hover') -nmap_leader('ll', 'lua vim.lsp.codelens.run()', 'Lens') -nmap_leader('lr', 'lua vim.lsp.buf.rename()', 'Rename') -nmap_leader('lR', 'lua vim.lsp.buf.references()', 'References') -nmap_leader('ls', 'lua vim.lsp.buf.definition()', 'Source definition') -nmap_leader('lt', 'lua vim.lsp.buf.type_definition()', 'Type definition') - -xmap_leader('lf', 'lua require("conform").format()', 'Format selection') - --- m is for 'Map'. Common usage: --- - `mt` - toggle map from 'mini.map' (closed by default) --- - `mf` - focus on the map for fast navigation --- - `ms` - change map's side (if it covers something underneath) -nmap_leader('mf', 'lua MiniMap.toggle_focus()', 'Focus (toggle)') -nmap_leader('mr', 'lua MiniMap.refresh()', 'Refresh') -nmap_leader('ms', 'lua MiniMap.toggle_side()', 'Side (toggle)') -nmap_leader('mt', 'lua MiniMap.toggle()', 'Toggle') - --- o is for 'Other'. Common usage: --- - `oz` - toggle between "zoomed" and regular view of current buffer -nmap_leader('or', 'lua MiniMisc.resize_window()', 'Resize to default width') -nmap_leader('ot', 'lua MiniTrailspace.trim()', 'Trim trailspace') -nmap_leader('oz', 'lua MiniMisc.zoom()', 'Zoom toggle') - --- s is for 'Session'. Common usage: --- - `sn` - start new session --- - `sr` - read previously started session --- - `sR` - restart Neovim preserving current session -local session_new = 'vim.ui.input({ prompt = "Session name: " }, MiniSessions.write)' - -nmap_leader('sd', 'lua MiniSessions.select("delete")', 'Delete') -nmap_leader('sn', 'lua ' .. session_new .. '', 'New') -nmap_leader('sr', 'lua MiniSessions.select("read")', 'Read') -nmap_leader('sR', 'lua MiniSessions.restart()', 'Restart') -nmap_leader('sw', 'lua MiniSessions.write()', 'Write current') - --- t is for 'Terminal' -nmap_leader('tT', 'horizontal term', 'Terminal (horizontal)') -nmap_leader('tt', 'vertical term', 'Terminal (vertical)') - --- v is for 'Visits'. Common usage: --- - `vv` - add "core" label to current file. --- - `vV` - remove "core" label to current file. --- - `vc` - pick among all files with "core" label. -local make_pick_core = function(cwd, desc) +local function lazy_setup(name, action) return function() - local sort_latest = MiniVisits.gen_sort.default({ recency_weight = 1 }) - local local_opts = { cwd = cwd, filter = 'core', sort = sort_latest } - MiniExtra.pickers.visit_paths(local_opts, { source = { name = desc } }) + if Config and type(Config["setup_" .. name]) == "function" then + Config["setup_" .. name]() + end + action() end end -nmap_leader('vc', make_pick_core('', 'Core visits (all)'), 'Core visits (all)') -nmap_leader('vC', make_pick_core(nil, 'Core visits (cwd)'), 'Core visits (cwd)') -nmap_leader('vv', 'lua MiniVisits.add_label("core")', 'Add "core" label') -nmap_leader('vV', 'lua MiniVisits.remove_label("core")', 'Remove "core" label') -nmap_leader('vl', 'lua MiniVisits.add_label()', 'Add label') -nmap_leader('vL', 'lua MiniVisits.remove_label()', 'Remove label') --- stylua: ignore end +-- AI ===================================================================== +nmap_leader("aa", lazy_setup("codecompanion", function() require("codecompanion").toggle_chat() end), + "Open CodeCompanion") + +-- Buffers ===================================================================== +nmap_leader("bd", function() vim.cmd("bd") end, "Delete") +nmap_leader("bD", function() vim.cmd("bd!") end, "Delete!") +nmap_leader("bw", function() vim.cmd("bw") end, "Wipeout") +nmap_leader("bW", function() vim.cmd("bw!") end, "Wipeout!") +nmap_leader("bo", function() vim.cmd("%bd|e#") end, "Close all but current") + +-- Debug ===================================================================== +nmap_leader("db", lazy_setup("dap", function() require("dap").toggle_breakpoint() end), "Toggle Breakpoint") +nmap_leader("dc", lazy_setup("dap", function() require("dap").continue() end), "Run/Continue") +nmap_leader("dC", lazy_setup("dap", function() require("dap").run_to_cursor() end), "Run to Cursor") +nmap_leader("de", lazy_setup("dap", function() require("dap.ui.widgets").hover() end), "Inspect") +nmap_leader("dt", lazy_setup("dap", function() require("dap").terminate() end), "Terminate") + +-- Explore ===================================================================== +nmap_leader("ed", function() MiniFiles.open() end, "Directory") +nmap_leader("ef", function() MiniFiles.open(vim.api.nvim_buf_get_name(0)) end, "File directory") +nmap_leader("en", function() MiniNotify.show_history() end, "Notifications") + +-- Find ===================================================================== +nmap_leader("f/", function() MiniPick.builtin.history({ scope = "/" }) end, '"/" history') +nmap_leader("f:", function() MiniPick.builtin.history({ scope = ":" }) end, '":" history') +nmap_leader("fb", function() MiniPick.builtin.buffers() end, "Buffers") +nmap_leader("fc", function() MiniPick.builtin.git_commits() end, "Commits (all)") +nmap_leader("fC", function() MiniPick.builtin.git_commits({ path = "%" }) end, "Commits (buf)") +nmap_leader("fd", function() MiniPick.builtin.diagnostic({ scope = "all" }) end, "Diagnostic workspace") +nmap_leader("fD", function() MiniPick.builtin.diagnostic({ scope = "current" }) end, "Diagnostic buffer") +nmap_leader("ff", function() MiniPick.builtin.files() end, "Files") +nmap_leader("fg", function() MiniPick.builtin.grep_live() end, "Grep live") +nmap_leader("fG", function() MiniPick.builtin.grep({ pattern = vim.fn.expand("") }) end, "Grep current word") +nmap_leader("fh", function() MiniPick.builtin.help() end, "Help tags") +nmap_leader("fl", function() MiniPick.builtin.buf_lines({ scope = "all" }) end, "Lines (all)") +nmap_leader("fL", function() MiniPick.builtin.buf_lines({ scope = "current" }) end, "Lines (buf)") +nmap_leader("fr", function() MiniPick.builtin.resume() end, "Resume") +nmap_leader("fs", function() MiniPick.builtin.lsp({ scope = "workspace_symbol_live" }) end, "Symbols workspace (live)") +nmap_leader("fS", function() MiniPick.builtin.lsp({ scope = "document_symbol" }) end, "Symbols document") + +-- Git ===================================================================== +nmap_leader("go", function() MiniDiff.toggle_overlay() end, "Toggle overlay") + +-- HTTP ===================================================================== +nmap_leader("hr", lazy_setup("kulala", function() require("kulala").run() end), "Send HTTP request") + +-- Language ===================================================================== +nmap_leader("la", vim.lsp.buf.code_action, "Actions") +nmap_leader("ld", vim.diagnostic.open_float, "Diagnostic popup") +nmap_leader("lf", function() require("conform").format() end, "Format") +nmap_leader("li", vim.lsp.buf.implementation, "Implementation") +nmap_leader("lh", vim.lsp.buf.hover, "Hover") +nmap_leader("ll", vim.lsp.codelens.run, "Lens") +nmap_leader("lr", vim.lsp.buf.rename, "Rename") +nmap_leader("lR", vim.lsp.buf.references, "References") +nmap_leader("ls", vim.lsp.buf.definition, "Source definition") +nmap_leader("lt", vim.lsp.buf.type_definition, "Type definition") +xmap_leader("lf", function() require("conform").format() end, "Format selection") + +-- Run ===================================================================== +nmap_leader("r", function() require("just").pick_just_task() end, "Run Just Task") + +-- Session ===================================================================== +nmap_leader("sd", function() MiniSessions.select("delete") end, "Delete") +nmap_leader("sn", function() vim.ui.input({ prompt = "Session name: " }, MiniSessions.write) end, "New") +nmap_leader("sr", function() MiniSessions.select("read") end, "Read") +nmap_leader("sR", function() MiniSessions.restart() end, "Restart") +nmap_leader("sw", function() MiniSessions.write() end, "Write current") + +-- Terminal ===================================================================== +nmap_leader("tT", function() vim.cmd("horizontal term") end, "Terminal (horizontal)") +nmap_leader("tt", function() vim.cmd("vertical term") end, "Terminal (vertical)") +nmap_leader("tg", function() require("terminal").open_terminal_app("lazygit") end, "LazyGit") +nmap_leader("ts", function() require("terminal").open_terminal_app("lazysql") end, "LazySQL") + +-- Overwrites ===================================================================== +nmap("", function() vim.cmd("nohlsearch") end, "Clear search highlights") diff --git a/plugin/30_mini.lua b/plugin/30_mini.lua index 107ea7e..2114724 100644 --- a/plugin/30_mini.lua +++ b/plugin/30_mini.lua @@ -1,805 +1,122 @@ --- ┌────────────────────┐ --- │ MINI configuration │ --- └────────────────────┘ --- --- This file contains configuration of the MINI parts of the config. --- It contains only configs for the 'mini.nvim' plugin (installed in 'init.lua'). --- --- 'mini.nvim' is a library of modules. Each is enabled independently via --- `require('mini.xxx').setup()` convention. It creates all intended side effects: --- mappings, autocommands, highlight groups, etc. It also creates a global --- `MiniXxx` table that can be later used to access module's features. --- --- Every module's `setup()` function accepts an optional `config` table to --- adjust its behavior. See the structure of this table at `:h MiniXxx.config`. --- --- See `:h mini.nvim-general-principles` for more general principles. --- --- Here each module's `setup()` has a brief explanation of what the module is for, --- its usage examples (uses Leader mappings from 'plugin/20_keymaps.lua'), and --- possible directions for more info. --- For more info about a module see its help page (`:h mini.xxx` for 'mini.xxx'). +-- UI ========================================================================== +Config.now(function() + -- Global icon provider. + require('mini.icons').setup() + Config.later(MiniIcons.tweak_lsp_kind) --- To minimize the time until first screen draw, modules are enabled in two steps: --- - Step one enables everything that is needed for first draw with `now()`. --- Sometimes needed only if Neovim is started as `nvim -- path/to/file`. --- - Everything else is delayed until the first draw with `later()`. -local now, now_if_args, later = Config.now, Config.now_if_args, Config.later + -- Notifications. + require('mini.notify').setup() --- Step one =================================================================== --- Enable 'base16' color scheme. -now(function() - require("mini.base16").setup({ - palette = { - base00 = "#191724", - base01 = "#1e1b2a", - base02 = "#403d52", - base03 = "#6e6a86", - base04 = "#908caa", - base05 = "#e0def4", - base06 = "#e0def4", - base07 = "#524f67", - base08 = "#ebbcba", - base09 = "#f6c177", - base0A = "#f6c177", - base0B = "#31748f", - base0C = "#9ccfd8", - base0D = "#c4a7e7", - base0E = "#c4a7e7", - base0F = "#eb6f92", - }, - }) + -- Start screen. + require('mini.starter').setup() + + -- Statusline. + require('mini.statusline').setup() end) --- Common configuration presets. Example usage: --- - `` in Insert mode - save and go to Normal mode --- - `go` / `gO` - insert empty line before/after in Normal mode --- - `gy` / `gp` - copy / paste from system clipboard --- - `\` + key - toggle common options. Like `\h` toggles highlighting search. --- - `` (four combos) - navigate between windows. --- - `` in Insert/Command mode - navigate in that mode. --- --- See also: --- - `:h MiniBasics.config.options` - list of adjusted options --- - `:h MiniBasics.config.mappings` - list of created mappings --- - `:h MiniBasics.config.autocommands` - list of created autocommands -now(function() - require("mini.basics").setup({ - -- Manage options in 'plugin/10_options.lua' for didactic purposes - options = { basic = false }, - mappings = { - -- Create `` mappings for window navigation - windows = true, - -- Create `` mappings for navigation in Insert and Command modes - move_with_alt = true, - }, - }) -end) +Config.later(function() + -- Git diff indicators. + require('mini.diff').setup() --- Icon provider. Usually no need to use manually. It is used by plugins like --- 'mini.pick', 'mini.files', 'mini.statusline', and others. -now(function() - -- Set up to not prefer extension-based icon for some extensions - local ext3_blocklist = { scm = true, txt = true, yml = true } - local ext4_blocklist = { json = true, yaml = true } - require("mini.icons").setup({ - use_file_extension = function(ext, _) - return not (ext3_blocklist[ext:sub(-3)] or ext4_blocklist[ext:sub(-4)]) - end, - }) - - -- Mock 'nvim-tree/nvim-web-devicons' for plugins without 'mini.icons' support. - -- Not needed for 'mini.nvim' or MiniMax, but might be useful for others. - later(MiniIcons.mock_nvim_web_devicons) - - -- Add LSP kind icons. Useful for 'mini.completion'. - later(MiniIcons.tweak_lsp_kind) -end) - --- Notifications provider. Shows all kinds of notifications in the upper right --- corner (by default). Example usage: --- - `:h vim.notify()` - show notification (hides automatically) --- - `en` - show notification history --- --- See also: --- - `:h MiniNotify.config` for some of common configuration examples. -now(function() - require("mini.notify").setup() -end) - --- Session management. A thin wrapper around `:h mksession` that consistently --- manages session files. Example usage: --- - `sn` - start new session --- - `sr` - read previously started session --- - `sd` - delete previously started session -now(function() - require("mini.sessions").setup() -end) - --- Start screen. This is what is shown when you open Neovim like `nvim`. --- Example usage: --- - Type prefix keys to limit available candidates --- - Navigate down/up with `` and `` --- - Press `` to select an entry --- --- See also: --- - `:h MiniStarter-example-config` - non-default config examples --- - `:h MiniStarter-lifecycle` - how to work with Starter buffer -now(function() - require("mini.starter").setup() -end) - --- Statusline. Sets `:h 'statusline'` to show more info in a line below window. --- Example usage: --- - Left most section indicates current mode (text + highlighting). --- - Second from left section shows "developer info": Git, diff, diagnostics, LSP. --- - Center section shows the name of displayed buffer. --- - Second to right section shows more buffer info. --- - Right most section shows current cursor coordinates and search results. --- --- See also: --- - `:h MiniStatusline-example-content` - example of default content. Use it to --- configure a custom statusline by setting `config.content.active` function. -now(function() - require("mini.statusline").setup() -end) - --- Tabline. Sets `:h 'tabline'` to show all listed buffers in a line at the top. --- Buffers are ordered as they were created. Navigate with `[b` and `]b`. -now(function() - require("mini.tabline").setup() -end) - --- Step one or two ============================================================ --- Load now if Neovim is started like `nvim -- path/to/file`, otherwise - later. --- This ensures a correct behavior for files opened during startup. - --- Completion and signature help. Implements async "two stage" autocompletion: --- - Based on attached LSP servers that support completion. --- - Fallback (based on built-in keyword completion) if there is no LSP candidates. --- --- Example usage in Insert mode with attached LSP: --- - Start typing text that should be recognized by LSP (like variable name). --- - After 100ms a popup menu with candidates appears. --- - Press `` / `` to navigate down/up the list. These are set up --- in 'mini.keymap'. You can also use `` / ``. --- - During navigation there is an info window to the right showing extra info --- that the LSP server can provide about the candidate. It appears after the --- candidate stays selected for 100ms. Use `` / `` to scroll it. --- - Navigating to an entry also changes buffer text. If you are happy with it, --- keep typing after it. To discard completion completely, press ``. --- - After pressing special trigger(s), usually `(`, a window appears that shows --- the signature of the current function/method. It gets updated as you type --- showing the currently active parameter. --- --- Example usage in Insert mode without an attached LSP or in places not --- supported by the LSP (like comments): --- - Start typing a word that is present in current or opened buffers. --- - After 100ms popup menu with candidates appears. --- - Navigate with `` / `` or `` / ``. This also updates --- buffer text. If happy with choice, keep typing. Stop with ``. --- --- It also works with snippet candidates provided by LSP server. Best experience --- when paired with 'mini.snippets' (which is set up in this file). -now_if_args(function() - -- Customize post-processing of LSP responses for a better user experience. - -- Don't show 'Text' suggestions (usually noisy) and show snippets last. - local process_items_opts = { kind_priority = { Text = -1, Snippet = 99 } } - local process_items = function(items, base) - return MiniCompletion.default_process_items(items, base, process_items_opts) - end - require("mini.completion").setup({ - lsp_completion = { - -- Without this config autocompletion is set up through `:h 'completefunc'`. - -- Although not needed, setting up through `:h 'omnifunc'` is cleaner - -- (sets up only when needed) and makes it possible to use ``. - source_func = "omnifunc", - auto_setup = false, - process_items = process_items, - }, - }) - - -- Set 'omnifunc' for LSP completion only when needed. - local on_attach = function(ev) - vim.bo[ev.buf].omnifunc = "v:lua.MiniCompletion.completefunc_lsp" - end - Config.new_autocmd("LspAttach", nil, on_attach, "Set 'omnifunc'") - - -- Advertise to servers that Neovim now supports certain set of completion and - -- signature features through 'mini.completion'. - vim.lsp.config("*", { capabilities = MiniCompletion.get_lsp_capabilities() }) -end) - --- Navigate and manipulate file system --- --- Navigation is done using column view (Miller columns) to display nested --- directories, they are displayed in floating windows in top left corner. --- --- Manipulate files and directories by editing text as regular buffers. --- --- Example usage: --- - `ed` - open current working directory --- - `ef` - open directory of current file (needs to be present on disk) --- --- Basic navigation: --- - `l` - go in entry at cursor: navigate into directory or open file --- - `h` - go out of focused directory --- - Navigate window as any regular buffer --- - Press `g?` inside explorer to see more mappings --- --- Basic manipulation: --- - After any following action, press `=` in Normal mode to synchronize, read --- carefully about actions, press `y` or `` to confirm --- - New entry: press `o` and type its name; end with `/` to create directory --- - Rename: press `C` and type new name --- - Delete: type `dd` --- - Move/copy: type `dd`/`yy`, navigate to target directory, press `p` --- --- See also: --- - `:h MiniFiles-navigation` - more details about how to navigate --- - `:h MiniFiles-manipulation` - more details about how to manipulate --- - `:h MiniFiles-examples` - examples of common setups -now_if_args(function() - -- Enable directory/file preview - require("mini.files").setup({ windows = { preview = true } }) - - -- Add common bookmarks for every explorer. Example usage inside explorer: - -- - `'c` to navigate into your config directory - -- - `g?` to see available bookmarks - local add_marks = function() - MiniFiles.set_bookmark("c", vim.fn.stdpath("config"), { desc = "Config" }) - local vimpack_plugins = vim.fn.stdpath("data") .. "/site/pack/core/opt" - MiniFiles.set_bookmark("p", vimpack_plugins, { desc = "Plugins" }) - MiniFiles.set_bookmark("w", vim.fn.getcwd, { desc = "Working directory" }) - end - Config.new_autocmd("User", "MiniFilesExplorerOpen", add_marks, "Add bookmarks") -end) - --- Miscellaneous small but useful functions. Example usage: --- - `oz` - toggle between "zoomed" and regular view of current buffer --- - `or` - resize window to its "editable width" --- - `:lua put_text(vim.lsp.get_clients())` - put output of a function below --- cursor in current buffer. Useful for a detailed exploration. --- - `:lua put(MiniMisc.stat_summary(MiniMisc.bench_time(f, 100)))` - run --- function `f` 100 times and report statistical summary of execution times -now_if_args(function() - -- Makes `:h MiniMisc.put()` and `:h MiniMisc.put_text()` public - require("mini.misc").setup() - - -- Change current working directory based on the current file path. It - -- searches up the file tree until the first root marker ('.git' or 'Makefile') - -- and sets their parent directory as a current directory. - -- This is helpful when simultaneously dealing with files from several projects. - MiniMisc.setup_auto_root() - - -- Restore latest cursor position on file open - MiniMisc.setup_restore_cursor() - - -- Synchronize terminal emulator background with Neovim's background to remove - -- possibly different color padding around Neovim instance - MiniMisc.setup_termbg_sync() -end) - --- Step two =================================================================== - --- Extra 'mini.nvim' functionality. --- --- See also: --- - `:h MiniExtra.pickers` - pickers. Most are mapped in `f` group. --- Calling `setup()` makes 'mini.pick' respect 'mini.extra' pickers. --- - `:h MiniExtra.gen_ai_spec` - 'mini.ai' textobject specifications --- - `:h MiniExtra.gen_highlighter` - 'mini.hipatterns' highlighters -later(function() - require("mini.extra").setup() -end) - --- Extend and create a/i textobjects, like `:h a(`, `:h a'`, and more). --- Contains not only `a` and `i` type of textobjects, but also their "next" and --- "last" variants that will explicitly search for textobjects after and before --- cursor. Example usage: --- - `ci)` - *c*hange *i*inside parenthesis (`)`) --- - `di(` - *d*elete *i*inside padded parenthesis (`(`) --- - `yaq` - *y*ank *a*round *q*uote (any of "", '', or ``) --- - `vif` - *v*isually select *i*inside *f*unction call --- - `cina` - *c*hange *i*nside *n*ext *a*rgument --- - `valaala` - *v*isually select *a*round *l*ast (i.e. previous) *a*rgument --- and then again reselect *a*round new *l*ast *a*rgument --- --- See also: --- - `:h text-objects` - general info about what textobjects are --- - `:h MiniAi-builtin-textobjects` - list of all supported textobjects --- - `:h MiniAi-textobject-specification` - examples of custom textobjects -later(function() - local ai = require("mini.ai") - ai.setup({ - -- 'mini.ai' can be extended with custom textobjects - custom_textobjects = { - -- Make `aB` / `iB` act on around/inside whole *b*uffer - B = MiniExtra.gen_ai_spec.buffer(), - -- For more complicated textobjects that require structural awareness, - -- use tree-sitter. This example makes `aF`/`iF` mean around/inside function - -- definition (not call). See `:h MiniAi.gen_spec.treesitter()` for details. - F = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }), - }, - - -- 'mini.ai' by default mostly mimics built-in search behavior: first try - -- to find textobject covering cursor, then try to find to the right. - -- Although this works in most cases, some are confusing. It is more robust to - -- always try to search only covering textobject and explicitly ask to search - -- for next (`an`/`in`) or last (`al`/`il`). - -- Try this. If you don't like it - delete next line and this comment. - search_method = "cover", - }) -end) - --- Align text interactively. Example usage: --- - `gaip,` - `ga` (align operator) *i*nside *p*aragraph by comma --- - `gAip` - start interactive alignment on the paragraph. Choose how to --- split, justify, and merge string parts. Press `` to make it permanent, --- press `` to go back to initial state. --- --- See also: --- - `:h MiniAlign-example` - hands-on list of examples to practice aligning --- - `:h MiniAlign.gen_step` - list of support step customizations --- - `:h MiniAlign-algorithm` - how alignment is done on algorithmic level -later(function() - require("mini.align").setup() -end) - --- Animate common Neovim actions. Like cursor movement, scroll, window resize, --- window open, window close. Animations are done based on Neovim events and --- don't require custom mappings. --- --- It is not enabled by default because its effects are a matter of taste. --- Also scroll and resize have some unwanted side effects (see `:h mini.animate`). --- Uncomment next line (use `gcc`) to enable. --- later(function() require('mini.animate').setup() end) - --- Go forward/backward with square brackets. Implements consistent sets of mappings --- for selected targets (like buffers, diagnostic, quickfix list entries, etc.). --- Example usage: --- - `]b` - go to next buffer --- - `[j` - go to previous jump inside current buffer --- - `[Q` - go to first entry of quickfix list --- - `]X` - go to last conflict marker in a buffer --- --- See also: --- - `:h MiniBracketed` - overall mapping design and list of targets -later(function() - require("mini.bracketed").setup() -end) - --- Remove buffers. Opened files occupy space in tabline and buffer picker. --- When not needed, they can be removed. Example usage: --- - `bw` - completely wipeout current buffer (see `:h :bwipeout`) --- - `bW` - completely wipeout current buffer even if it has changes --- - `bd` - delete current buffer (see `:h :bdelete`) -later(function() - require("mini.bufremove").setup() -end) - --- Show next key clues in a bottom right window. Requires explicit opt-in for --- keys that act as clue trigger. Example usage: --- - Press `` and wait for 1 second. A window with information about --- next available keys should appear. --- - Press one of the listed keys. Window updates immediately to show information --- about new next available keys. You can press `` to go back in key sequence. --- - Press keys until they resolve into some mapping. --- --- Note: it is designed to work in buffers for normal files. It doesn't work in --- special buffers (like for 'mini.starter' or 'mini.files') to not conflict --- with its local mappings. --- --- See also: --- - `:h MiniClue-examples` - examples of common setups --- - `:h MiniClue.ensure_buf_triggers()` - use it to enable triggers in buffer --- - `:h MiniClue.set_mapping_desc()` - change mapping description not from config -later(function() - local miniclue = require("mini.clue") - -- stylua: ignore + -- Keymap hints. + local miniclue = require('mini.clue') miniclue.setup({ - -- Define which clues to show. By default shows only clues for custom mappings - -- (uses `desc` field from the mapping; takes precedence over custom clue). clues = { - -- This is defined in 'plugin/20_keymaps.lua' with Leader group descriptions Config.leader_group_clues, miniclue.gen_clues.builtin_completion(), miniclue.gen_clues.g(), miniclue.gen_clues.marks(), miniclue.gen_clues.registers(), miniclue.gen_clues.square_brackets(), - -- This creates a submode for window resize mappings. Try the following: - -- - Press `s` to make a window split. - -- - Press `+` to increase height. Clue window still shows clues as if - -- `` is pressed again. Keep pressing just `+` to increase height. - -- Try pressing `-` to decrease height. - -- - Stop submode either by `` or by any key that is not in submode. miniclue.gen_clues.windows({ submode_resize = true }), miniclue.gen_clues.z(), }, - -- Explicitly opt-in for set of common keys to trigger clue window triggers = { { mode = { 'n', 'x' }, keys = '' }, -- Leader triggers - { mode = 'n', keys = '\\' }, -- mini.basics + { mode = 'n', keys = '\\' }, -- mini.basics { mode = { 'n', 'x' }, keys = '[' }, -- mini.bracketed { mode = { 'n', 'x' }, keys = ']' }, - { mode = 'i', keys = '' }, -- Built-in completion + { mode = 'i', keys = '' }, -- Built-in completion { mode = { 'n', 'x' }, keys = 'g' }, -- `g` key { mode = { 'n', 'x' }, keys = "'" }, -- Marks { mode = { 'n', 'x' }, keys = '`' }, { mode = { 'n', 'x' }, keys = '"' }, -- Registers { mode = { 'i', 'c' }, keys = '' }, - { mode = 'n', keys = '' }, -- Window commands + { mode = 'n', keys = '' }, -- Window commands { mode = { 'n', 'x' }, keys = 's' }, -- `s` key (mini.surround, etc.) { mode = { 'n', 'x' }, keys = 'z' }, -- `z` key }, }) end) --- Command line tweaks. Improves command line editing with: --- - Autocompletion. Basically an automated `:h cmdline-completion`. --- - Autocorrection of words as-you-type. Like `:W`->`:w`, `:lau`->`:lua`, etc. --- - Autopeek command range (like line number at the start) as-you-type. -later(function() - require("mini.cmdline").setup() +-- Editing ===================================================================== +Config.later(function() + -- Enhanced text objects (a/i). + require('mini.ai').setup() + + -- Auto-close brackets and quotes. + require('mini.pairs').setup() + + -- Surround functionality (add/delete/replace). + require('mini.surround').setup() end) --- Comment lines. Provides functionality to work with commented lines. --- Uses `:h 'commentstring'` option to infer comment structure. --- Example usage: --- - `gcip` - toggle comment (`gc`) *i*inside *p*aragraph --- - `vapgc` - *v*isually select *a*round *p*aragraph and toggle comment (`gc`) --- - `gcgc` - uncomment (`gc`, operator) comment block at cursor (`gc`, textobject) --- --- The built-in `:h commenting` is based on 'mini.comment'. Yet this module is --- still enabled as it provides more customization opportunities. -later(function() - require("mini.comment").setup() +-- Navigation ================================================================== +Config.now_if_args(function() + -- File system explorer. + require('mini.files').setup() + local add_marks = function() + MiniFiles.set_bookmark('c', vim.fn.stdpath('config'), { desc = 'Config' }) + MiniFiles.set_bookmark('w', vim.fn.getcwd, { desc = 'Working directory' }) + end + Config.autocmd('User', 'MiniFilesExplorerOpen', add_marks, 'Add default marks') end) --- Autohighlight word under cursor with a customizable delay. --- Word boundaries are defined based on `:h 'iskeyword'` option. --- --- later(function() --- require("mini.cursorword").setup() --- end) +Config.later(function() + -- Fuzzy picker. + require('mini.pick').setup() --- Work with diff hunks that represent the difference between the buffer text and --- some reference text set by a source. Default source uses text from Git index. --- Also provides summary info used in developer section of 'mini.statusline'. --- Example usage: --- - `ghip` - apply hunks (`gh`) within *i*nside *p*aragraph --- - `gHG` - reset hunks (`gH`) from cursor until end of buffer (`G`) --- - `ghgh` - apply (`gh`) hunk at cursor (`gh`) --- - `gHgh` - reset (`gH`) hunk at cursor (`gh`) --- - `go` - toggle overlay --- --- See also: --- - `:h MiniDiff-overview` - overview of how module works --- - `:h MiniDiff-diff-summary` - available summary information --- - `:h MiniDiff.gen_source` - available built-in sources --- Show di -later(function() require('mini.diff').setup() end) -later(function() - require("mini.diff").setup() + -- Square bracket navigation. + require('mini.bracketed').setup() end) --- Git integration for more straightforward Git actions based on Neovim's state. --- It is not meant as a fully featured Git client, only to provide helpers that --- integrate better with Neovim. Example usage: --- - `gs` - show information at cursor --- - `gd` - show unstaged changes as a patch in separate tabpage --- - `gL` - show Git log of current file --- - `:Git help git` - show output of `git help git` inside Neovim --- --- See also: --- - `:h MiniGit-examples` - examples of common setups --- - `:h :Git` - more details about `:Git` user command --- - `:h MiniGit.show_at_cursor()` - what information at cursor is shown -later(function() - require("mini.git").setup() +-- Completion ================================================================== +Config.now_if_args(function() + -- Autocompletion and signature help. + require('mini.completion').setup({ + lsp_completion = { + source_func = 'omnifunc', + auto_setup = false, + process_items = function(items, base) + return MiniCompletion.default_process_items(items, base, { kind_priority = { Text = -1 } }) + end, + }, + }) + + -- Set 'omnifunc' for LSP completion only when needed. + local on_attach = function(ev) + vim.bo[ev.buf].omnifunc = 'v:lua.MiniCompletion.completefunc_lsp' + end + Config.autocmd('LspAttach', nil, on_attach, "Set 'omnifunc'") + + -- Advertise to servers that Neovim supports certain set of completion features. + vim.lsp.config('*', { capabilities = MiniCompletion.get_lsp_capabilities() }) end) --- Highlight patterns in text. Like `TODO`/`NOTE` or color hex codes. --- Example usage: --- - `:Pick hipatterns` - pick among all highlighted patterns --- --- See also: --- - `:h MiniHipatterns-examples` - examples of common setups -later(function() - local hipatterns = require("mini.hipatterns") - local hi_words = MiniExtra.gen_highlighter.words - hipatterns.setup({ - highlighters = { - -- Highlight a fixed set of common words. Will be highlighted in any place, - -- not like "only in comments". - fixme = hi_words({ "FIXME", "Fixme", "fixme" }, "MiniHipatternsFixme"), - hack = hi_words({ "HACK", "Hack", "hack" }, "MiniHipatternsHack"), - todo = hi_words({ "TODO", "Todo", "todo" }, "MiniHipatternsTodo"), - note = hi_words({ "NOTE", "Note", "note" }, "MiniHipatternsNote"), - - -- Highlight hex color string (#aabbcc) with that color as a background - hex_color = hipatterns.gen_highlighter.hex_color(), - }, - }) +-- Workspace & Utilities ======================================================= +Config.now(function() + -- Session management. + require('mini.sessions').setup() end) --- Visualize and work with indent scope. It visualizes indent scope "at cursor" --- with animated vertical line. Provides relevant motions and textobjects. --- Example usage: --- - `cii` - *c*hange *i*nside *i*ndent scope --- - `Vaiai` - *V*isually select *a*round *i*ndent scope and then again --- reselect *a*round new *i*indent scope --- - `[i` / `]i` - navigate to scope's top / bottom --- --- See also: --- - `:h MiniIndentscope.gen_animation` - available animation rules -later(function() - require("mini.indentscope").setup() +Config.now_if_args(function() + -- Miscellaneous utility functions. + require('mini.misc').setup() + MiniMisc.setup_auto_root() + MiniMisc.setup_restore_cursor() end) --- Jump to next/previous single character. It implements "smarter `fFtT` keys" --- (see `:h f`) that work across multiple lines, start "jumping mode", and --- highlight all target matches. Example usage: --- - `fxff` - move *f*orward onto next character "x", then next, and next again --- - `dt)` - *d*elete *t*ill next closing parenthesis (`)`) -later(function() - require("mini.jump").setup() -end) - --- Jump within visible lines to pre-defined spots via iterative label filtering. --- Spots are computed by a configurable spotter function. Example usage: --- - Lock eyes on desired location to jump --- - `` - start jumping; this shows character labels over target spots --- - Type character that appears over desired location; number of target spots --- should be reduced --- - Keep typing labels until target spot is unique to perform the jump --- --- See also: --- - `:h MiniJump2d.gen_spotter` - list of available spotters -later(function() - require("mini.jump2d").setup() -end) - --- Special key mappings. Provides helpers to map: --- - Multi-step actions. Apply action 1 if condition is met; else apply --- action 2 if condition is met; etc. --- - Combos. Sequence of keys where each acts immediately plus execute extra --- action if all are typed fast enough. Useful for Insert mode mappings to not --- introduce delay when typing mapping keys without intention to execute action. --- --- See also: --- - `:h MiniKeymap-examples` - examples of common setups --- - `:h MiniKeymap.map_multistep()` - map multi-step action --- - `:h MiniKeymap.map_combo()` - map combo -later(function() - require("mini.keymap").setup() - -- Navigate 'mini.completion' menu with `` / `` - MiniKeymap.map_multistep("i", "", { "pmenu_next" }) - MiniKeymap.map_multistep("i", "", { "pmenu_prev" }) - -- On `` try to accept current completion item, fall back to accounting - -- for pairs from 'mini.pairs' - MiniKeymap.map_multistep("i", "", { "pmenu_accept", "minipairs_cr" }) - -- On `` just try to account for pairs from 'mini.pairs' - MiniKeymap.map_multistep("i", "", { "minipairs_bs" }) -end) - --- Move any selection in any direction. Example usage in Normal mode: --- - ``/`` - move current line down / up --- - ``/`` - decrease / increase indent of current line --- --- Example usage in Visual mode: --- - ``/``/``/`` - move selection left/down/up/right -later(function() - require("mini.move").setup() -end) - --- Text edit operators. All operators have mappings for: --- - Regular operator (waits for motion/textobject to use) --- - Current line action (repeat second character of operator to activate) --- - Act on visual selection (type operator in Visual mode) --- --- Example usage: --- - `griw` - replace (`gr`) *i*inside *w*ord --- - `gmm` - multiple/duplicate (`gm`) current line (extra `m`) --- - `vipgs` - *v*isually select *i*nside *p*aragraph and sort it (`gs`) --- - `gxiww.` - exchange (`gx`) *i*nside *w*ord with next word (`w` to navigate --- to it and `.` to repeat exchange operator) --- - `g==` - execute current line as Lua code and replace with its output. --- For example, typing `g==` over line `vim.lsp.get_clients()` shows --- information about all available LSP clients. --- --- See also: --- - `:h MiniOperators-mappings` - overview of how mappings are created --- - `:h MiniOperators-overview` - overview of present operators -later(function() - require("mini.operators").setup() - - -- Create mappings for swapping adjacent arguments. Notes: - -- - Relies on `a` argument textobject from 'mini.ai'. - -- - It is not 100% reliable, but mostly works. - -- - It overrides `:h (` and `:h )`. - -- Explanation: `gx`-`ia`-`gx`-`ila` <=> exchange current and last argument - -- Usage: when on `a` in `(aa, bb)` press `)` followed by `(`. - vim.keymap.set("n", "(", "gxiagxila", { remap = true, desc = "Swap arg left" }) - vim.keymap.set("n", ")", "gxiagxina", { remap = true, desc = "Swap arg right" }) -end) - --- Autopairs functionality. Insert pair when typing opening character and go over --- right character if it is already to cursor's right. Also provides mappings for --- `` and `` to perform extra actions when inside pair. --- Example usage in Insert mode: --- - `(` - insert "()" and put cursor between them --- - `)` when there is ")" to the right - jump over ")" without inserting new one --- - `(` - always insert a single "(" literally. This is useful since --- 'mini.pairs' doesn't provide particularly smart behavior, like auto balancing -later(function() - -- Create pairs not only in Insert, but also in Command line mode - require("mini.pairs").setup({ modes = { command = true } }) -end) - --- Pick anything with single window layout and fast matching. This is one of --- the main usability improvements as it powers a lot of "find things quickly" --- workflows. How to use a picker: --- - Start picker, usually with `:Pick ` command. Like `:Pick files`. --- It shows a single window in the bottom left corner filled with possible items --- to choose from. Current item has special full line highlighting. --- At the top there is a current query used to filter+sort items. --- - Type characters (appear at top) to narrow down items. There is fuzzy matching: --- characters may not match one-by-one, but they should be in correct order. --- - Navigate down/up with ``/``. --- - Press `` to show item's preview. `` again goes back to items. --- - Press `` to show picker's info. `` again goes back to items. --- - Press `` to choose an item. The exact action depends on the picker: `files` --- picker opens a selected file, `help` picker opens help page on selected tag. --- To close picker without choosing an item, press ``. --- --- Example usage: --- - `ff` - *f*ind *f*iles; for best performance requires `ripgrep` --- - `fg` - *f*ind inside files (a.k.a. "to *g*rep"); requires `ripgrep` --- - `fh` - *f*ind *h*elp tag --- - `fr` - *r*esume latest picker --- - `:h vim.ui.select()` - implemented with 'mini.pick' --- --- See also: --- - `:h MiniPick-overview` - overview of picker functionality --- - `:h MiniPick-examples` - examples of common setups --- - `:h MiniPick.builtin` and `:h MiniExtra.pickers` - available pickers; --- Execute one either with Lua function, `:Pick ` command, or --- one of `f` mappings defined in 'plugin/20_keymaps.lua' -later(function() - require("mini.pick").setup() -end) - --- Manage and expand snippets (templates for a frequently used text). --- Typical workflow is to type snippet's (configurable) prefix and expand it --- into a snippet session. --- --- How to manage snippets: --- - 'mini.snippets' itself doesn't come with preconfigured snippets. Instead there --- is a flexible system of how snippets are prepared before expanding. --- They can come from pre-defined path on disk, 'snippets/' directories inside --- config or plugins, defined inside `setup()` call directly. --- - This config, however, does come with snippet configuration: --- - 'snippets/global.json' is a file with global snippets that will be --- available in any buffer --- - 'after/snippets/lua.json' defines personal snippets for Lua language --- - 'friendly-snippets' plugin configured in 'plugin/40_plugins.lua' provides --- a collection of language snippets --- --- How to expand a snippet in Insert mode: --- - If you know snippet's prefix, type it as a word and press ``. Snippet's --- body should be inserted instead of the prefix. --- - If you don't remember snippet's prefix, type only part of it (or none at all) --- and press ``. It should show picker with all snippets that have prefixes --- matching typed characters (or all snippets if none was typed). --- Choose one and its body should be inserted instead of previously typed text. --- --- How to navigate during snippet session: --- - Snippets can contain tabstops - places for user to interactively adjust text. --- Each tabstop is highlighted depending on session progression - whether tabstop --- is current, was or was not visited. If tabstop doesn't yet have text, it is --- visualized with special "ghost" inline text: • and ∎ by default. --- - Type necessary text at current tabstop and navigate to next/previous one --- by pressing `` / ``. --- - Repeat previous step until you reach special final tabstop, usually denoted --- by ∎ symbol. If you spotted a mistake in an earlier tabstop, navigate to it --- and return back to the final tabstop. --- - To end a snippet session when at final tabstop, keep typing or go into --- Normal mode. To force end snippet session, press ``. --- --- See also: --- - `:h MiniSnippets-overview` - overview of how module works --- - `:h MiniSnippets-examples` - examples of common setups --- - `:h MiniSnippets-session` - details about snippet session --- - `:h MiniSnippets.gen_loader` - list of available loaders -later(function() - -- Define language patterns to work better with 'friendly-snippets' - local latex_patterns = { "latex/**/*.json", "**/latex.json" } - local lang_patterns = { - tex = latex_patterns, - plaintex = latex_patterns, - -- Recognize special injected language of markdown tree-sitter parser - markdown_inline = { "markdown.json" }, - } - - local snippets = require("mini.snippets") - local config_path = vim.fn.stdpath("config") - snippets.setup({ - snippets = { - -- Always load 'snippets/global.json' from config directory - snippets.gen_loader.from_file(config_path .. "/snippets/global.json"), - -- Load from 'snippets/' directory of plugins, like 'friendly-snippets' - snippets.gen_loader.from_lang({ lang_patterns = lang_patterns }), - }, - }) - - -- By default snippets available at cursor are not shown as candidates in - -- 'mini.completion' menu. This requires a dedicated in-process LSP server - -- that will provide them. To have that, uncomment next line (use `gcc`). - -- MiniSnippets.start_lsp_server() -end) - --- Split and join arguments (regions inside brackets between allowed separators). --- It uses Lua patterns to find arguments, which means it works in comments and --- strings but can be not as accurate as tree-sitter based solutions. --- Each action can be configured with hooks (like add/remove trailing comma). --- Example usage: --- - `gS` - toggle between joined (all in one line) and split (each on a separate --- line and indented) arguments. It is dot-repeatable (see `:h .`). --- --- See also: --- - `:h MiniSplitjoin.gen_hook` - list of available hooks -later(function() - require("mini.splitjoin").setup() -end) - --- Surround actions: add/delete/replace/find/highlight. Working with surroundings --- is surprisingly common: surround word with quotes, replace `)` with `]`, etc. --- This module comes with many built-in surroundings, each identified by a single --- character. It searches only for surrounding that covers cursor and comes with --- a special "next" / "last" versions of actions to search forward or backward --- (just like 'mini.ai'). All text editing actions are dot-repeatable (see `:h .`). --- --- Example usage (this may feel intimidating at first, but after practice it --- becomes second nature during text editing): --- - `saiw)` - *s*urround *a*dd for *i*nside *w*ord parenthesis (`)`) --- - `sdf` - *s*urround *d*elete *f*unction call (like `f(var)` -> `var`) --- - `srb[` - *s*urround *r*eplace *b*racket (any of [], (), {}) with padded `[` --- - `sf*` - *s*urround *f*ind right part of `*` pair (like bold in markdown) --- - `shf` - *s*urround *h*ighlight current *f*unction call --- - `srn{{` - *s*urround *r*eplace *n*ext curly bracket `{` with padded `{` --- - `sdl'` - *s*urround *d*elete *l*ast quote pair (`'`) --- - `vaWsa` - *v*isually select *a*round *W*ORD and *s*urround *a*dd --- spaces (``) --- --- See also: --- - `:h MiniSurround-builtin-surroundings` - list of all supported surroundings --- - `:h MiniSurround-surrounding-specification` - examples of custom surroundings --- - `:h MiniSurround-vim-surround-config` - alternative set of action mappings -later(function() - require("mini.surround").setup() -end) - --- Highlight and remove trailspace. Temporarily stops highlighting in Insert mode --- to reduce noise when typing. Example usage: --- - `ot` - trim all trailing whitespace in a buffer -later(function() - require("mini.trailspace").setup() -end) - --- Track and reuse file system visits. Every file/directory visit is persistently --- tracked on disk to later reuse: show in special frecency order, etc. It also --- supports adding labels to visited paths to quickly navigate between them. --- Example usage: --- - `fv` - find across all visits --- - `vv` / `vV` - add/remove special "core" label to current file --- - `vc` / `vC` - show files with "core" label; all or added within --- current working directory --- --- See also: --- - `:h MiniVisits-overview` - overview of how module works --- - `:h MiniVisits-examples` - examples of common setups -later(function() - require("mini.visits").setup() +Config.later(function() + -- Extra functionality (pickers, clues). + require('mini.extra').setup() end) diff --git a/plugin/40_plugins.lua b/plugin/40_plugins.lua index f14418a..eab067a 100644 --- a/plugin/40_plugins.lua +++ b/plugin/40_plugins.lua @@ -1,141 +1,99 @@ -local add = vim.pack.add -local now_if_args, later = Config.now_if_args, Config.later - -now_if_args(function() - -- Define hook to update tree-sitter parsers after plugin is updated - local ts_update = function() - vim.cmd("TSUpdate") - end - Config.on_packchanged("nvim-treesitter", { "update" }, ts_update, ":TSUpdate") - - add({ - "https://github.com/nvim-treesitter/nvim-treesitter", - "https://github.com/nvim-treesitter/nvim-treesitter-textobjects", - }) - - local languages = { - "lua", - "vimdoc", - "markdown", - "go", - "yaml", - "html", - } - local isnt_installed = function(lang) - return #vim.api.nvim_get_runtime_file("parser/" .. lang .. ".*", false) == 0 - end - local to_install = vim.tbl_filter(isnt_installed, languages) - if #to_install > 0 then - require("nvim-treesitter").install(to_install) - end - - -- Enable tree-sitter after opening a file for a target language - local filetypes = {} - for _, lang in ipairs(languages) do - for _, ft in ipairs(vim.treesitter.language.get_filetypes(lang)) do - table.insert(filetypes, ft) - end - end - local ts_start = function(ev) - vim.treesitter.start(ev.buf) - end - Config.new_autocmd("FileType", filetypes, ts_start, "Start tree-sitter") +-- Colortheme ================================================================== +Config.now(function() + vim.pack.add({ "https://github.com/rebelot/kanagawa.nvim" }) + require("kanagawa").setup({ compile = true }) + vim.cmd("colo kanagawa") end) --- Language servers =========================================================== - --- Language Server Protocol (LSP) is a set of conventions that power creation of --- language specific tools. It requires two parts: --- - Server - program that performs language specific computations. --- - Client - program that asks server for computations and shows results. --- --- Here Neovim itself is a client (see `:h vim.lsp`). Language servers need to --- be installed separately based on your OS, CLI tools, and preferences. --- See note about 'mason.nvim' at the bottom of the file. --- --- Neovim's team collects commonly used configurations for most language servers --- inside 'neovim/nvim-lspconfig' plugin. --- --- Add it now if file (and not 'mini.starter') is shown after startup. --- --- Troubleshooting: --- - Run `:checkhealth vim.lsp` to see potential issues. -now_if_args(function() - add({ "https://github.com/neovim/nvim-lspconfig" }) - - -- Use `:h vim.lsp.enable()` to automatically enable language server based on - -- the rules provided by 'nvim-lspconfig'. - vim.lsp.enable({ - "gopls", - "lua_ls", - "yamlls", - }) - - -- Use `:h vim.lsp.config()` or 'after/lsp/' directory to configure servers. - -- Uncomment and tweak the following `vim.lsp.enable()` call to enable servers. - -- vim.lsp.config({ - -- -- For example, if `lua-language-server` is installed, use `'lua_ls'` entry - -- }) +-- Mason ==================================================================== +Config.now_if_args(function() + vim.pack.add({ "https://github.com/mason-org/mason.nvim" }) + require("mason").setup() end) --- Formatting ================================================================= - --- Programs dedicated to text formatting (a.k.a. formatters) are very useful. --- Neovim has built-in tools for text formatting (see `:h gq` and `:h 'formatprg'`). --- They can be used to configure external programs, but it might become tedious. --- --- The 'stevearc/conform.nvim' plugin is a good and maintained solution for easier --- formatting setup. -later(function() - add({ "https://github.com/stevearc/conform.nvim" }) - - -- See also: - -- - `:h Conform` - -- - `:h conform-options` - -- - `:h conform-formatters` - require("conform").setup({ - default_format_opts = { - -- Allow formatting from LSP server if no dedicated formatter is available - lsp_format = "fallback", - }, - format_on_save = { - lsp_format = "fallback", - timeout_ms = 500, - }, - -- Map of filetype to formatters - -- Make sure that necessary CLI tool is available - -- formatters_by_ft = { lua = { 'stylua' } }, - formatters_by_ft = { - go = { "gofumpt", "goimports" }, - lua = { "stylua" }, - }, - }) +-- Treesitter ================================================================== +Config.now_if_args(function() + vim.pack.add({ "https://github.com/arborist-ts/arborist.nvim" }) + require("arborist").setup() end) --- Snippets =================================================================== +-- LSP ========================================================================= +Config.now_if_args(function() + vim.pack.add({ "https://github.com/neovim/nvim-lspconfig" }) --- Although 'mini.snippets' provides functionality to manage snippet files, it --- deliberately doesn't come with those. --- --- The 'rafamadriz/friendly-snippets' is currently the largest collection of --- snippet files. They are organized in 'snippets/' directory (mostly) per language. --- 'mini.snippets' is designed to work with it as seamlessly as possible. --- See `:h MiniSnippets.gen_loader.from_lang()`. --- later(function() --- add({ "https://github.com/rafamadriz/friendly-snippets" }) --- end) - --- Honorable mentions ========================================================= - --- 'mason-org/mason.nvim' (a.k.a. "Mason") is a great tool (package manager) for --- installing external language servers, formatters, and linters. It provides --- a unified interface for installing, updating, and deleting such programs. --- --- The caveat is that these programs will be set up to be mostly used inside Neovim. --- If you need them to work elsewhere, consider using other package managers. --- --- You can use it like so: -now_if_args(function() - add({ "https://github.com/mason-org/mason.nvim" }) - require("mason").setup() + vim.lsp.enable({ + "ansiblels", + "gopls", + "intelephense", + "lua_ls", + "tailwindcss", + "vtsls", + }) end) + +-- Conform ===================================================================== +Config.now_if_args(function() + vim.pack.add({ "https://github.com/stevearc/conform.nvim" }) + + require("conform").setup({ + default_format_opts = { lsp_format = "fallback" }, + format_on_save = { + lsp_format = "fallback", + timeout_ms = 500, + }, + formatters_by_ft = { + go = { "gofumpt", "goimports" }, + php = { "php_cs_fixer" }, + }, + }) +end) + +-- DAP ========================================================================= +function Config.setup_dap() + if package.loaded["dap"] then + return + end + + vim.pack.add({ "https://github.com/mfussenegger/nvim-dap" }) + + local dap = require("dap") + + dap.adapters.php = { + type = "executable", + command = "node", + args = { vim.fn.stdpath("data") .. "/mason/packages/php-debug-adapter/extension/out/phpDebug.js" }, + } + + dap.adapters.go = { + type = "server", + host = "127.0.0.1", + port = "${port}", + } +end + +-- Kulala ====================================================================== +function Config.setup_kulala() + if package.loaded["kulala"] then + return + end + + vim.pack.add({ "https://github.com/mistweaverco/kulala.nvim" }) + require("kulala").setup({ default_env = "dev" }) +end + +-- CodeCompanion =============================================================== +function Config.setup_codecompanion() + if package.loaded["codecompanion"] then + return + end + + vim.pack.add({ + "https://github.com/nvim-lua/plenary.nvim", + "https://github.com/olimorris/codecompanion.nvim" + }) + require("codecompanion").setup({ + completion = { + provider = "native" + } + }) +end