diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4aafd4f..1bc893c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: rev: v0.43.0 hooks: - id: markdownlint - args: [-c, .markdownlint.yaml, --fix] + args: [-c, .markdownlint.json, --fix] - repo: https://github.com/adrienverge/yamllint rev: v1.35.1 diff --git a/docs/nvim-keybindings.md b/docs/nvim-keybindings.md index 84ddb84..4453e84 100644 --- a/docs/nvim-keybindings.md +++ b/docs/nvim-keybindings.md @@ -2,62 +2,60 @@ ```txt -x *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +x *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "" -n *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "" -x " *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +x " *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after """ -n " *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n " *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after """ -x ' *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +x ' *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "'" -n ' *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n ' *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "'" -x ` *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +x ` *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "`" -n ` *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n ` *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "`" -x g *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +x g *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "g" -n g *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n g *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "g" -x z *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +x z *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "z" -n z *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n z *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "z" -n *@~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n *@~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Query keys after "" n * :nohlsearch Clear Search Highlighting -n qQ * :q! +n qQ * ~/.config/nvim/lua/keymaps.lua Force quit without saving n qw * :wq Write and quit -n qq * :wq! +n qq * ~/.config/nvim/lua/keymaps.lua Quit with force saving n qf * :q Quicker close split n tn * :Noice dismiss Noice: Dismiss Notification -n tl * :lua vim.o.bg = vim.o.bg:get() == "light" and "dark" or "light" +n tl * ~/.config/nvim/lua/utils.lua Toggle Light/Dark Mode n te * :Neotree toggle Toggle Neotree n tc * :CloakToggle Cloak: Toggle -n o * ~/.config/nvim/lua/keymaps.lua - Open repo in browser n xx * :Trouble diagnostics - Trouble: Diagnostic + Diagnostic n xw * :Trouble workspace_diagnostics - Trouble: Workspace Diagnostics + Workspace Diagnostics n xq * :Trouble quickfix - Trouble: Quickfix + Quickfix n xl * :Trouble loclist - Trouble: Location List + Location List n xd * :Trouble document_diagnostics - Trouble: Document Diagnostics + Document Diagnostics n sx * :Telescope import Telescope: Import n sw * :Telescope grep_string @@ -76,8 +74,8 @@ n sl * :Telescope luasnip Search LuaSnip n sk * :Telescope keymaps Search Keymaps -n sh * :Telescope highlights - List Highlights +n sh * :Telescope help_tags + Help tags n sg * :Telescope live_grep Search by Grep n sd * :Telescope diagnostics @@ -122,10 +120,8 @@ n cl * :Lspsaga show_cursor_diagnostics Cursor Diagnostics n ci * :Lspsaga implement Implementations -x cf * :lua vim.lsp.buf.format() - Format -n cf * :lua vim.lsp.buf.format() - Format +n cg * :lua require("neogen").generate() + Generate annotations n cd * :Lspsaga show_line_diagnostics Line Diagnostics n cco * :Lspsaga outgoing_calls @@ -134,8 +130,6 @@ n cci * :Lspsaga incoming_calls Incoming Calls n ca * :Lspsaga code_action Code Action -n cg * :lua require("neogen").generate() - Generate annotations n bw * :lua MiniBufremove.wipeout() Wipeout n bl * :bnext @@ -148,6 +142,34 @@ n bh * :bprev Prev n bd * :lua MiniBufremove.delete() Delete +n ba * :%bd|e#|bd# + Close all except current +n o * ~/.config/nvim/lua/keymaps.lua + Open repo in browser +n tmw * setlocal wrap! wrap? + Toggle 'wrap' +n tms * setlocal spell! spell? + Toggle 'spell' +n tmr * setlocal relativenumber! relativenumber? + Toggle 'relativenumber' +n tmn * setlocal number! number? + Toggle 'number' +n tml * setlocal list! list? + Toggle 'list' +n tmi * setlocal ignorecase! ignorecase? + Toggle 'ignorecase' +n tmh * let v:hlsearch = 1 - v:hlsearch | echo (v:hlsearch ? " " : "no") . "hlsearch" + Toggle search highlight +n tmd * lua print(MiniBasics.toggle_diagnostic()) + Toggle diagnostic +n tmC * setlocal cursorcolumn! cursorcolumn? + Toggle 'cursorcolumn' +n tmc * setlocal cursorline! cursorline? + Toggle 'cursorline' +n tmb * lua vim.o.bg = vim.o.bg == "dark" and "light" or "dark"; print(vim.o.bg) + Toggle 'background' + cf * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua + Format buffer x # * vim/_defaults.lua :help v_#-default o % (MatchitOperationForward) @@ -157,7 +179,7 @@ n & * :&& :help &-default x * * vim/_defaults.lua :help v_star-default -o ; * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua +o ; * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua Repeat jump x ; * lua MiniJump.jump() Repeat jump @@ -171,11 +193,11 @@ v > * >gv Indent Right n > * >gv Indent Right -n @ * ~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n @ * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Execute macro without 'mini.clue' triggers x @ * mode() == 'V' ? ':normal! @'.getcharstr().'' : '@' :help v_@-default -o F * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua +o F * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua Jump backward x F * lua MiniJump.smart_jump(true, false) Jump backward @@ -183,11 +205,11 @@ n F * lua MiniJump.smart_jump(true, false) Jump backward n K * :Lspsaga hover_doc Hover Documentation -n Q * ~/.local/share/nvim/lazy/mini.clue/lua/mini/clue.lua +n Q * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/clue.lua Execute macro without 'mini.clue' triggers x Q * mode() == 'V' ? ':normal! @=reg_recorded()' : 'Q' :help v_Q-default -o T * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua +o T * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua Jump backward till x T * lua MiniJump.smart_jump(true, true) Jump backward till @@ -197,10 +219,10 @@ n Y * y$ :help Y-default n Zk * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua Flash Treesitter -x Zk * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua - Flash Treesitter o Zk * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua Flash Treesitter +x Zk * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua + Flash Treesitter o [% (MatchitOperationMultiBackward) x [% (MatchitVisualMultiBackward) n [% (MatchitNormalMultiBackward) @@ -252,7 +274,7 @@ o ai * lua MiniIndentscope.textobject(true) Object scope with border x ai * lua MiniIndentscope.textobject(true) Object scope with border -o f * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua +o f * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua Jump forward x f * lua MiniJump.smart_jump(false, false) Jump forward @@ -263,16 +285,10 @@ n gR * :RegexplainerToggle o g% (MatchitOperationBackward) x g% (MatchitVisualBackward) n g% (MatchitNormalBackward) -o gh * lua MiniDiff.textobject() - Hunk range textobject -x gH * ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua - Reset hunks -n gH * ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua - Reset hunks -x gh * ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua - Apply hunks -n gh * ~/.local/share/nvim/lazy/mini.diff/lua/mini/diff.lua - Apply hunks +x gS * :lua MiniSplitjoin.toggle({ region = MiniSplitjoin.get_visual_region() }) + Toggle arguments +n gS * v:lua.MiniSplitjoin.operator("toggle") . " " + Toggle arguments x gs * lua MiniOperators.sort('visual') Sort selection n gss ^gsg_ @@ -299,17 +315,39 @@ n g== g=_ Evaluate line n g= * v:lua.MiniOperators.evaluate() Evaluate operator -x gS * :lua MiniSplitjoin.toggle({ region = MiniSplitjoin.get_visual_region() }) - Toggle arguments -n gS * v:lua.MiniSplitjoin.operator("toggle") . " " - Toggle arguments +o gh * lua MiniDiff.textobject() + Hunk range textobject +x gH * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/diff.lua + Reset hunks +n gH * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/diff.lua + Reset hunks +x gh * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/diff.lua + Apply hunks +n gh * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/diff.lua + Apply hunks +x g/ * /\%V + Search inside visual selection +n gV * "`[" . strpart(getregtype(), 0, 1) . "`]" + Visually select changed text +x gp * "+P + Paste from system clipboard +n gp * "+p + Paste from system clipboard +x gy * "+y + Copy to system clipboard +n gy * "+y + Copy to system clipboard +n go * v:lua.MiniBasics.put_empty_line(v:false) + Put empty line below +n gO * v:lua.MiniBasics.put_empty_line(v:true) + Put empty line above o gc * lua MiniComment.textobject() Comment textobject -n gcc * ~/.local/share/nvim/lazy/mini.comment/lua/mini/comment.lua +n gcc * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/comment.lua Comment line -x gc * ~/.local/share/nvim/lazy/mini.comment/lua/mini/comment.lua +x gc * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/comment.lua Comment selection -n gc * ~/.local/share/nvim/lazy/mini.comment/lua/mini/comment.lua +n gc * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/comment.lua Comment x gx * lua MiniOperators.exchange('visual') Exchange selection @@ -319,47 +357,49 @@ o ii * lua MiniIndentscope.textobject(false) Object scope x ii * lua MiniIndentscope.textobject(false) Object scope +x j * v:count == 0 ? 'gj' : 'j' n j * v:count == 0 ? 'gj' : 'j' Move down +x k * v:count == 0 ? 'gk' : 'k' n k * v:count == 0 ? 'gk' : 'k' Move up -n shn * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n shn * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Highlight next surrounding -n sFn * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sFn * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Find next left surrounding -n sfn * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sfn * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Find next right surrounding -n srn * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n srn * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Replace next surrounding -n sdn * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sdn * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Delete next surrounding -n shl * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n shl * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Highlight previous surrounding -n sFl * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sFl * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Find previous left surrounding -n sfl * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sfl * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Find previous right surrounding -n srl * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n srl * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Replace previous surrounding -n sdl * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sdl * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Delete previous surrounding x sa * :lua MiniSurround.add('visual') Add surrounding to selection -n sn * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sn * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Update `MiniSurround.config.n_lines` -n sh * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sh * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Highlight surrounding -n sF * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sF * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Find left surrounding -n sf * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sf * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Find right surrounding -n sr * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sr * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Replace surrounding -n sd * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sd * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Delete surrounding -n sa * ~/.local/share/nvim/lazy/mini.surround/lua/mini/surround.lua +n sa * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/surround.lua Add surrounding -o t * ~/.local/share/nvim/lazy/mini.jump/lua/mini/jump.lua +o t * ~/.local/share/nvim/lazy/mini.nvim/lua/mini/jump.lua Jump forward till x t * lua MiniJump.smart_jump(false, true) Jump forward till @@ -367,20 +407,10 @@ n t * lua MiniJump.smart_jump(false, true) Jump forward till x zk * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua Flash -n zk * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua - Flash o zk * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua Flash -n = * = - Equal Size Splits -n + * :resize +5 - H Resize + -n - * :resize -5 - H Resize - -n . * :vertical resize +10 - V Resize + -n , * :vertical resize -10 - V Resize - +n zk * ~/.local/share/nvim/lazy/lazy.nvim/lua/lazy/core/handler/keys.lua + Flash v * :m '>+1gv=gv Move Block Down n * :m '>+1gv=gv @@ -389,12 +419,24 @@ v * :m '<-2gv=gv Move Block Up n * :m '<-2gv=gv Move Block Up -n * :w! - Save +n = * = + Equal Size Splits +n + * :resize +10 + H Resize + +n - * :resize -10 + H Resize - +n . * :vertical resize +10 + V Resize + +n , * :vertical resize -10 + V Resize - n * :echo "Use j to move!!" + ? n * :echo "Use k to move!!" + ? n * :echo "Use l to move!!" + ? n * :echo "Use h to move!!" + ? x (MatchitVisualTextObject) (MatchitVisualMultiBackward)o(MatchitVisualMultiForward) o (MatchitOperationMultiForward) * :call matchit#MultiMatch("W", "o") o (MatchitOperationMultiBackward) * :call matchit#MultiMatch("bW", "o") @@ -408,6 +450,7 @@ x (MatchitVisualBackward) * :call matchit#Match_wrapper('',0,'v')(MatchitVisualForward) * :call matchit#Match_wrapper('',1,'v'):if col("''") != col("$") | exe ":normal! m'" | endifgv`` n (MatchitNormalBackward) * :call matchit#Match_wrapper('',0,'n') n (MatchitNormalForward) * :call matchit#Match_wrapper('',1,'n') +n PlenaryTestFile * :lua require('plenary.test_harness').test_file(vim.fn.expand("%:p")) n * lua MiniMove.move_line('up') Move line up n * lua MiniMove.move_line('down') @@ -424,7 +467,10 @@ x * lua MiniMove.move_selection('right') Move right x * lua MiniMove.move_selection('left') Move left -n PlenaryTestFile * :lua require('plenary.test_harness').test_file(vim.fn.expand("%:p")) +x * silent! update | redraw + Save and go to Normal mode +n * :w! + Save n d Show diagnostics under the cursor n d * vim/_defaults.lua @@ -433,4 +479,4 @@ n * :lua vim.lsp.buf.signature_help() Signature ``` -- Generated on Mon 9 Dec 2024 10:05:25 EET +- Generated on Thu 2 Jan 2025 17:41:13 EET diff --git a/docs/tmux-keybindings.md b/docs/tmux-keybindings.md index 23103eb..0b63b39 100644 --- a/docs/tmux-keybindings.md +++ b/docs/tmux-keybindings.md @@ -2,17 +2,13 @@ Leader: `` -``` - C-o Rotate through the panes - C-z Suspend the current client +```txt Space Select next layout # List all paste buffers $ Rename current session % Split window horizontally & Kill current window ' Prompt for window index to select - ( Switch to previous client - ) Switch to next client , Rename current window - Delete the most recent paste buffer . Move the current window @@ -63,6 +59,8 @@ Leader: `` M-3 Set the main-horizontal layout M-4 Set the main-vertical layout M-5 Select the tiled layout + M-6 Set the main-horizontal-mirrored layout + M-7 Set the main-vertical-mirrored layout M-n Select the next window with an alert M-o Rotate through the panes in reverse M-p Select the previous window with an alert @@ -70,6 +68,8 @@ Leader: `` M-Down Resize the pane down by 5 M-Left Resize the pane left by 5 M-Right Resize the pane right by 5 + C-o Rotate through the panes + C-z Suspend the current client C-Up Resize the pane up C-Down Resize the pane down C-Left Resize the pane left diff --git a/docs/wezterm-keybindings.md b/docs/wezterm-keybindings.md index 5554472..ed29154 100644 --- a/docs/wezterm-keybindings.md +++ b/docs/wezterm-keybindings.md @@ -277,4 +277,4 @@ Mouse: alt_screen ``` -- Generated on Sat 10 Aug 2024 13:01:59 EEST +- Generated on Thu 2 Jan 2025 17:41:13 EET diff --git a/local/bin/x-dfm-docs-xterm-keybindings b/local/bin/x-dfm-docs-xterm-keybindings index 688dbe7..452fd29 100755 --- a/local/bin/x-dfm-docs-xterm-keybindings +++ b/local/bin/x-dfm-docs-xterm-keybindings @@ -23,7 +23,8 @@ generate_tmux_keybindings() { local tmux_keybindings_docs="$1" - local cb="\n\`\`\`\n" + local cb="\n\`\`\`txt\n" + local cbe="\n\`\`\`\n" local kb kb=$(tmux lsk -Tprefix -N | sed -e 's/^/ /;') local h="# tmux keybindings\n" @@ -33,7 +34,7 @@ generate_tmux_keybindings() kb="${kb//$HOME/\$HOME}" msg "Outputting tmux keybindings to $tmux_keybindings_docs" - echo -e "${h}${l}${cb}${kb}${cb}" > "$tmux_keybindings_docs" + echo -e "${h}${l}${cb}${kb}${cbe}" > "$tmux_keybindings_docs" msg "Done!" }