From bf15bb77fbbc80c1c55bdd9bd8dc392d4d9e0b87 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 12:36:36 -0500 Subject: [PATCH 01/15] load themes from repository --- init.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/init.lua b/init.lua index 8719106c..3ba1301b 100644 --- a/init.lua +++ b/init.lua @@ -390,6 +390,9 @@ do }, } + vim.pack.add { gh 'catppuccin/nvim' } + vim.pack.add { gh 'rose-pine/neovim' } + -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. From 977a6babc2b2c4d92e1489716affa7864c3e4878 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 12:37:56 -0500 Subject: [PATCH 02/15] initial smoketest document --- doc/smoketest.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/smoketest.md diff --git a/doc/smoketest.md b/doc/smoketest.md new file mode 100644 index 00000000..7d6dd40f --- /dev/null +++ b/doc/smoketest.md @@ -0,0 +1,7 @@ +# Smoketest + +A manual smoketest checklist to ensure features are working: + +## Plugins Load +- [ ] Catppuccin Theme +- [ ] Rose Pine Theme From 79901a1270ee6ad636846476f9b6529d75993eda Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 12:43:48 -0500 Subject: [PATCH 03/15] update oil configuration to vim pack --- doc/smoketest.md | 8 +++++++- lua/custom/plugins/oil.lua | 17 +++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/doc/smoketest.md b/doc/smoketest.md index 7d6dd40f..8c7bc571 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -2,6 +2,12 @@ A manual smoketest checklist to ensure features are working: -## Plugins Load +## Plugin + +### Custom +- [ ] Oil + - Shortcut `-` should open Oil + +### Themes - [ ] Catppuccin Theme - [ ] Rose Pine Theme diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua index 66018eb6..d1ce8092 100644 --- a/lua/custom/plugins/oil.lua +++ b/lua/custom/plugins/oil.lua @@ -1,7 +1,12 @@ -return { - 'stevearc/oil.nvim', - config = function() - require('oil').setup() - vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }) - end, +-- return { +-- 'stevearc/oil.nvim', +-- config = function() +-- require('oil').setup() +-- vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }) +-- end, +-- } + +vim.pack.add { 'https://github.com/stevearc/oil.nvim' } +require('oil').setup { + vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), } From 5e4274bb8276e5ba9d44d0361ca959c4f56895e5 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 12:49:04 -0500 Subject: [PATCH 04/15] configure vimtmuxnavigator with vim pack --- doc/smoketest.md | 2 ++ lua/custom/plugins/mini.lua | 1 + lua/custom/plugins/oil.lua | 8 -------- lua/custom/plugins/vimtmuxnavigator.lua | 4 +--- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/doc/smoketest.md b/doc/smoketest.md index 8c7bc571..f5b281e3 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -7,6 +7,8 @@ A manual smoketest checklist to ensure features are working: ### Custom - [ ] Oil - Shortcut `-` should open Oil +- [ ] VimTmuxNavigator + - Should be able to navigate between nvim and tmux panes using `j`, `k`, `h`, `l` for each respective direction ### Themes - [ ] Catppuccin Theme diff --git a/lua/custom/plugins/mini.lua b/lua/custom/plugins/mini.lua index bea310ba..11a72641 100644 --- a/lua/custom/plugins/mini.lua +++ b/lua/custom/plugins/mini.lua @@ -1,3 +1,4 @@ +--FIX: fix/postmerge-20260701: make sure this configuration applies to upstreams version of mini return { 'nvim-mini/mini.nvim', config = function() diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua index d1ce8092..016895d2 100644 --- a/lua/custom/plugins/oil.lua +++ b/lua/custom/plugins/oil.lua @@ -1,11 +1,3 @@ --- return { --- 'stevearc/oil.nvim', --- config = function() --- require('oil').setup() --- vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }) --- end, --- } - vim.pack.add { 'https://github.com/stevearc/oil.nvim' } require('oil').setup { vim.keymap.set('n', '-', 'Oil', { desc = 'Open parent directory' }), diff --git a/lua/custom/plugins/vimtmuxnavigator.lua b/lua/custom/plugins/vimtmuxnavigator.lua index d4aaccb2..c4e21b1b 100644 --- a/lua/custom/plugins/vimtmuxnavigator.lua +++ b/lua/custom/plugins/vimtmuxnavigator.lua @@ -1,3 +1 @@ -return { - 'christoomey/vim-tmux-navigator', -} +vim.pack.add { 'https://github.com/christoomey/vim-tmux-navigator' } From dae771e520c9a6b0cd65a3bbe57b1fbb266505e5 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 13:08:39 -0500 Subject: [PATCH 05/15] configure snacks with vim pack --- doc/smoketest.md | 9 ++++- lua/custom/plugins/snacks.lua | 63 ++++++++++++++++++++++------------- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/doc/smoketest.md b/doc/smoketest.md index f5b281e3..0dcf2209 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -7,8 +7,15 @@ A manual smoketest checklist to ensure features are working: ### Custom - [ ] Oil - Shortcut `-` should open Oil +- [ ] Snacks + - Should load dashboard at start, and `=` should open dashboard + - `gb` should open the remote git repository in a browser + - `gl` should open lazy git + - `no` should open a scratchpad + - `ns` browses existing notes in scratchpad + - `` should open a terminal - [ ] VimTmuxNavigator - - Should be able to navigate between nvim and tmux panes using `j`, `k`, `h`, `l` for each respective direction + - Should be able to navigate between nvim and tmux panes using ``, ``, ``, `` for each respective direction ### Themes - [ ] Catppuccin Theme diff --git a/lua/custom/plugins/snacks.lua b/lua/custom/plugins/snacks.lua index 8144c975..76325a25 100644 --- a/lua/custom/plugins/snacks.lua +++ b/lua/custom/plugins/snacks.lua @@ -1,24 +1,41 @@ -return { - 'folke/snacks.nvim', - priority = 1000, - lazy = false, - ---@type snacks.Config - opts = { - --TODO: Use this for a bit and compare to mini dashboard - --TODO: design a style and featuers for my dashboard (add opening parent directory with Oil) - dashboard = { enabled = true }, - gitbrowse = { enabled = true }, - lazygit = { enabled = true }, - --TODO: determine a method for deleting scratches easily - scratch = { enabled = true }, - terminal = { enabled = true }, - }, - keys = { - { '=', function() Snacks.dashboard.open() end, desc = 'Dashboard' }, - { 'gb', function() Snacks.gitbrowse.open() end, desc = 'Open Git Repository in Browser' }, - { 'gl', function() Snacks.lazygit.open() end, desc = 'Open Lazy Git' }, - { 'no', function() Snacks.scratch() end, desc = 'Open Notepad' }, - { 'ns', function() Snacks.scratch.select() end, desc = 'Select Note' }, - { '', function() Snacks.terminal() end, desc = 'Open Terminal' }, - }, +-- return { +-- 'folke/snacks.nvim', +-- priority = 1000, +-- lazy = false, +-- ---@type snacks.Config +-- opts = { +-- dashboard = { enabled = true }, +-- gitbrowse = { enabled = true }, +-- lazygit = { enabled = true }, +-- scratch = { enabled = true }, +-- terminal = { enabled = true }, +-- }, +-- keys = { +-- { '=', function() Snacks.dashboard.open() end, desc = 'Dashboard' }, +-- { 'gb', function() Snacks.gitbrowse.open() end, desc = 'Open Git Repository in Browser' }, +-- { 'gl', function() Snacks.lazygit.open() end, desc = 'Open Lazy Git' }, +-- { 'no', function() Snacks.scratch() end, desc = 'Open Notepad' }, +-- { 'ns', function() Snacks.scratch.select() end, desc = 'Select Note' }, +-- { '', function() Snacks.terminal() end, desc = 'Open Terminal' }, +-- }, +-- } + +--TODO: design a style and features for my dashboard (add opening parent directory with Oil) +--TODO: determine a method for deleting scratches easily + +--FIX: postmerge-20260701: Dashboard not working +vim.pack.add { 'https://github.com/folke/snacks.nvim' } +require('snacks').setup { + -- dashboard = { enabled = true }, + gitbrowse = { enabled = true }, + lazygit = { enabled = true }, + scratch = { enabled = true }, + terminal = { enabled = true }, } + +-- vim.keymap.set('n', '=', function() Snacks.dashboard.open() end, { desc = 'Dashboard' }) +vim.keymap.set('n', 'gb', function() Snacks.gitbrowse.open() end, { desc = 'Open [G]it Repository in [B]rowser' }) +vim.keymap.set('n', 'gl', function() Snacks.lazygit.open() end, { desc = 'Open [L]azy [G]it' }) +vim.keymap.set('n', 'no', function() Snacks.scratch() end, { desc = '[O]pen [N]otepad' }) +vim.keymap.set('n', 'ns', function() Snacks.scratch.select() end, { desc = '[S]elect [N]ote' }) +vim.keymap.set('n', '', function() Snacks.terminal() end, { desc = 'Open [T]erminal' }) From 36247a0bad6f789483f3ed6ef8c1a0a1160652eb Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 13:34:28 -0500 Subject: [PATCH 06/15] define snacks dashboard sections --- lua/custom/plugins/snacks.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lua/custom/plugins/snacks.lua b/lua/custom/plugins/snacks.lua index 76325a25..7018d1d7 100644 --- a/lua/custom/plugins/snacks.lua +++ b/lua/custom/plugins/snacks.lua @@ -26,14 +26,20 @@ --FIX: postmerge-20260701: Dashboard not working vim.pack.add { 'https://github.com/folke/snacks.nvim' } require('snacks').setup { - -- dashboard = { enabled = true }, + dashboard = { + enabled = true, + sections = { + { section = 'header' }, + { section = 'keys', gap = 1, padding = 1 }, + }, + }, gitbrowse = { enabled = true }, lazygit = { enabled = true }, scratch = { enabled = true }, terminal = { enabled = true }, } --- vim.keymap.set('n', '=', function() Snacks.dashboard.open() end, { desc = 'Dashboard' }) +vim.keymap.set('n', '=', function() Snacks.dashboard.open() end, { desc = 'Dashboard' }) vim.keymap.set('n', 'gb', function() Snacks.gitbrowse.open() end, { desc = 'Open [G]it Repository in [B]rowser' }) vim.keymap.set('n', 'gl', function() Snacks.lazygit.open() end, { desc = 'Open [L]azy [G]it' }) vim.keymap.set('n', 'no', function() Snacks.scratch() end, { desc = '[O]pen [N]otepad' }) From ce1ed6710329907c7d6ec0e5958b1446eb6dca4c Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 13:40:54 -0500 Subject: [PATCH 07/15] configure guttermakrs with vim pack --- doc/smoketest.md | 2 ++ lua/custom/plugins/guttermarks.lua | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/smoketest.md b/doc/smoketest.md index 0dcf2209..1dcea1b5 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -16,6 +16,8 @@ A manual smoketest checklist to ensure features are working: - `` should open a terminal - [ ] VimTmuxNavigator - Should be able to navigate between nvim and tmux panes using ``, ``, ``, `` for each respective direction +- [ ] Guttermarks + - Marks (place a mark with `m`) should be displayed in the gutter by their character ### Themes - [ ] Catppuccin Theme diff --git a/lua/custom/plugins/guttermarks.lua b/lua/custom/plugins/guttermarks.lua index fbc79a63..8fa1d3d6 100644 --- a/lua/custom/plugins/guttermarks.lua +++ b/lua/custom/plugins/guttermarks.lua @@ -1,4 +1 @@ -return { - 'dimtion/guttermarks.nvim', - event = { 'BufReadPost', 'BufNewFile', 'BufWritePre', 'FileType' }, -} +vim.pack.add { "https://github.com/dimtion/guttermarks.nvim" } From c7972483e9290c6e0dde8ea6a4f68707a0f9d45c Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 13:47:17 -0500 Subject: [PATCH 08/15] configure remote sshfs with vim pack --- doc/smoketest.md | 2 ++ lua/custom/plugins/remote-sshfs.lua | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/smoketest.md b/doc/smoketest.md index 1dcea1b5..1f2d0e73 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -16,6 +16,8 @@ A manual smoketest checklist to ensure features are working: - `` should open a terminal - [ ] VimTmuxNavigator - Should be able to navigate between nvim and tmux panes using ``, ``, ``, `` for each respective direction +- [ ] Remote SSHFS + - Should be able to remotely access a directory using the `:RemoteSSHFSConnect` command - [ ] Guttermarks - Marks (place a mark with `m`) should be displayed in the gutter by their character diff --git a/lua/custom/plugins/remote-sshfs.lua b/lua/custom/plugins/remote-sshfs.lua index dda4fd04..a5937a27 100644 --- a/lua/custom/plugins/remote-sshfs.lua +++ b/lua/custom/plugins/remote-sshfs.lua @@ -1,8 +1,11 @@ -return { - 'nosduco/remote-sshfs.nvim', - dependencies = { 'nvim-telescope/telescope.nvim', 'nvim-lua/plenary.nvim' }, - opts = {}, -} +-- return { +-- 'nosduco/remote-sshfs.nvim', +-- dependencies = { 'nvim-telescope/telescope.nvim', 'nvim-lua/plenary.nvim' }, +-- opts = {}, +-- } + +vim.pack.add { "https://github.com/nosduco/remote-sshfs.nvim"} +require('remote-sshfs').setup() -- Usage: :RemoteSSHFSConnect @:/path/to/file -- Sometimes you have to force close, and that causes permission failed on reconnect. From 42a028a955a744943631a675c47af8cec763021d Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 13:55:06 -0500 Subject: [PATCH 09/15] create smoketests for kickstart plugins --- doc/smoketest.md | 9 ++++++++- lua/custom/plugins/typescript-tools.lua | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/smoketest.md b/doc/smoketest.md index 1f2d0e73..239737d0 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -2,9 +2,16 @@ A manual smoketest checklist to ensure features are working: -## Plugin +## Plugins +### Kickstart +Kickstart plugins *that are enabled* should be working +- [ ] Autopairs + - Brackets, parenthesis, etc, should automatically close +- [ ] IndentLine + - Should see visual indentation guides for indented lines ### Custom +Custom plugins should be working - [ ] Oil - Shortcut `-` should open Oil - [ ] Snacks diff --git a/lua/custom/plugins/typescript-tools.lua b/lua/custom/plugins/typescript-tools.lua index ba7fb204..4d2aea2f 100644 --- a/lua/custom/plugins/typescript-tools.lua +++ b/lua/custom/plugins/typescript-tools.lua @@ -1,3 +1,4 @@ +--TODO: fix/postmerge: what does this do? is it needed? does the typescript-language-server cover this? return { 'pmizio/typescript-tools.nvim', dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' }, From 7f27bec8876b0acc8b8adc8a8b7098ea53b2bc3f Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 14:07:23 -0500 Subject: [PATCH 10/15] include smoketests for settings --- doc/smoketest.md | 11 +++++++++++ init.lua | 13 +++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/doc/smoketest.md b/doc/smoketest.md index 239737d0..3ef6c8ce 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -31,3 +31,14 @@ Custom plugins should be working ### Themes - [ ] Catppuccin Theme - [ ] Rose Pine Theme + +## Settings +- [ ] Nerd fonts should be enabled +- [ ] Line numbers should be relative +- [ ] Virtual Diagnostic Lines (errors/warnings) should be beneath the applicable line +- [ ] Arrow key navigation should be disabled +- [ ] Should connect to godot server when running + +## LSP + +### Formatting diff --git a/init.lua b/init.lua index 3ba1301b..ff4b22c5 100644 --- a/init.lua +++ b/init.lua @@ -194,8 +194,8 @@ do underline = { severity = { min = vim.diagnostic.severity.WARN } }, -- Can switch between these as you prefer - virtual_text = true, -- Text shows up at the end of the line - virtual_lines = false, -- Text shows up underneath the line, with virtual lines + virtual_text = false, -- Text shows up at the end of the line + virtual_lines = true, -- Text shows up underneath the line, with virtual lines -- Auto open the float, so you can easily read the errors when jumping with `[d` and `]d` jump = { @@ -220,10 +220,10 @@ do vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) -- TIP: Disable arrow keys in normal mode - -- vim.keymap.set('n', '', 'echo "Use h to move!!"') - -- vim.keymap.set('n', '', 'echo "Use l to move!!"') - -- vim.keymap.set('n', '', 'echo "Use k to move!!"') - -- vim.keymap.set('n', '', 'echo "Use j to move!!"') + vim.keymap.set('n', '', 'echo "Use h to move!!"') + vim.keymap.set('n', '', 'echo "Use l to move!!"') + vim.keymap.set('n', '', 'echo "Use k to move!!"') + vim.keymap.set('n', '', 'echo "Use j to move!!"') -- Keybinds to make split navigation easier. -- Use CTRL+ to switch between windows @@ -372,6 +372,7 @@ do { 's', group = '[S]earch', mode = { 'n', 'v' } }, { 't', group = '[T]oggle' }, { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first + -- TODO: LSP actions should be with the leader key { 'gr', group = 'LSP Actions', mode = { 'n' } }, }, } From d732fe7b59179560b6ff56ff6b0c228c186bacf0 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 14:27:27 -0500 Subject: [PATCH 11/15] reenable lsps for common filetypes --- doc/smoketest.md | 11 ++++++++++- init.lua | 11 ++++++++--- lua/custom/plugins/typescript-tools.lua | 8 ++------ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/doc/smoketest.md b/doc/smoketest.md index 3ef6c8ce..1fadc999 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -41,4 +41,13 @@ Custom plugins should be working ## LSP -### Formatting +- [ ] LSP, autocomplete, and formatting should work for the following file types + - Javascript `.js`, `.jsx` + - Typescript `.ts`, `.tsx` + - Svelte `.svelte` + - C# `.cs` + - Lua `.lua` +- [ ] Mason should ensure that the following tools are installed + - Clangd + - Pyright + - Omnisharp diff --git a/init.lua b/init.lua index ff4b22c5..5f988bce 100644 --- a/init.lua +++ b/init.lua @@ -372,7 +372,7 @@ do { 's', group = '[S]earch', mode = { 'n', 'v' } }, { 't', group = '[T]oggle' }, { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first - -- TODO: LSP actions should be with the leader key + -- TODO: LSP actions (anything with `gr`) should be with the leader key { 'gr', group = 'LSP Actions', mode = { 'n' } }, }, } @@ -697,9 +697,9 @@ do -- See `:help lsp-config` for information about keys and how to configure ---@type table local servers = { - -- clangd = {}, + clangd = {}, -- gopls = {}, - -- pyright = {}, + pyright = {}, -- rust_analyzer = {}, -- -- Some languages (like typescript) have entire language plugins that can be useful: @@ -708,6 +708,8 @@ do -- But for many setups, the LSP (`ts_ls`) will work just fine -- ts_ls = {}, + omnisharp = {}, -- Used to format C# code + stylua = {}, -- Used to format Lua code -- Special Lua Config, as recommended by neovim help docs @@ -765,6 +767,9 @@ do local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { -- You can add other tools here that you want Mason to install + 'clangd', + 'pyright', + 'omnisharp', }) require('mason-tool-installer').setup { ensure_installed = ensure_installed } diff --git a/lua/custom/plugins/typescript-tools.lua b/lua/custom/plugins/typescript-tools.lua index 4d2aea2f..f35d3fdb 100644 --- a/lua/custom/plugins/typescript-tools.lua +++ b/lua/custom/plugins/typescript-tools.lua @@ -1,6 +1,2 @@ ---TODO: fix/postmerge: what does this do? is it needed? does the typescript-language-server cover this? -return { - 'pmizio/typescript-tools.nvim', - dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' }, - opts = {}, -} +vim.pack.add { 'https://github.com/pmizio/typescript-tools.nvim' } +require('typescript-tools').setup {} From c5a6106f59a03661fa5201ea1b5fd518fbc4b7c8 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 14:39:30 -0500 Subject: [PATCH 12/15] enabme mini git and mini move configurations --- init.lua | 2 ++ lua/custom/plugins/mini.lua | 38 +++++++------------------------------ 2 files changed, 9 insertions(+), 31 deletions(-) diff --git a/init.lua b/init.lua index 5f988bce..f5318d28 100644 --- a/init.lua +++ b/init.lua @@ -420,6 +420,7 @@ do -- - va) - [V]isually select [A]round [)]paren -- - yiiq - [Y]ank [I]nside [I]+1 [Q]uote -- - ci' - [C]hange [I]nside [']quote + --FIX: mini.ai does not seem to be working correctly. Conflicts? require('mini.ai').setup { -- NOTE: Avoid conflicts with the built-in incremental selection mappings on Neovim>=0.12 (see `:help treesitter-incremental-selection`) mappings = { @@ -434,6 +435,7 @@ do -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren -- - sd' - [S]urround [D]elete [']quotes -- - sr)' - [S]urround [R]eplace [)] ['] + --FIX: mini.surround does not seem to be working correctly. Conflicts? require('mini.surround').setup() -- Simple and easy statusline. diff --git a/lua/custom/plugins/mini.lua b/lua/custom/plugins/mini.lua index 11a72641..061127a8 100644 --- a/lua/custom/plugins/mini.lua +++ b/lua/custom/plugins/mini.lua @@ -1,33 +1,9 @@ ---FIX: fix/postmerge-20260701: make sure this configuration applies to upstreams version of mini -return { - 'nvim-mini/mini.nvim', - config = function() - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [Q]uote - -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { n_lines = 500 } +require('mini.git').setup() - -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] - require('mini.surround').setup() +vim.keymap.set('n', 'ga', 'Git add -A', { desc = 'Git add all' }) +vim.keymap.set('n', 'gc', 'Git commit', { desc = 'Git commit' }) +vim.keymap.set('n', 'gs', 'Git status', { desc = 'Git status' }) +vim.keymap.set('n', 'gg', 'Git log --graph --oneline --all', { desc = 'Git graph' }) - require('mini.move').setup() - require('mini.git').setup() - - local statusline = require 'mini.statusline' - statusline.setup { use_icons = vim.g.have_nerd_font } - ---@diagnostic disable-next-line: duplicate-set-field - statusline.section_location = function() return '%2l:%-2v' end - - vim.keymap.set('n', 'ga', 'Git add -A', { desc = 'Git add all' }) - vim.keymap.set('n', 'gc', 'Git commit', { desc = 'Git commit' }) - vim.keymap.set('n', 'gs', 'Git status', { desc = 'Git status' }) - vim.keymap.set('n', 'gg', 'Git log --graph --oneline --all', { desc = 'Git graph' }) - end, -} +require('mini.move').setup() +-- usage: Alt = directional keys should move the line in normal mode From c7262b832c4cb724f2d894c0fb69d91dd84fd971 Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 14:42:34 -0500 Subject: [PATCH 13/15] add git and notepad actions to whichkey --- init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init.lua b/init.lua index f5318d28..ae53f036 100644 --- a/init.lua +++ b/init.lua @@ -374,6 +374,8 @@ do { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, -- Enable gitsigns recommended keymaps first -- TODO: LSP actions (anything with `gr`) should be with the leader key { 'gr', group = 'LSP Actions', mode = { 'n' } }, + { 'g', group = '[G]it' }, + { 'n', group = '[N]otepad' }, }, } From 665f1bd6a3d766c1d6ac0024216e64ac054b824d Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 14:44:38 -0500 Subject: [PATCH 14/15] add which key records to smoketest --- doc/smoketest.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/smoketest.md b/doc/smoketest.md index 1fadc999..6f0d3ef3 100644 --- a/doc/smoketest.md +++ b/doc/smoketest.md @@ -3,6 +3,13 @@ A manual smoketest checklist to ensure features are working: ## Plugins +### Default +- [ ] Whichkey should have accurate keybindings + - g -> [G]it + - n -> [N]otepad + - s -> [S]earch + - t -> [T]oggle + ### Kickstart Kickstart plugins *that are enabled* should be working - [ ] Autopairs From 44e0f9468a66ebf5cd2cd98dbb6528b5418e9f9d Mon Sep 17 00:00:00 2001 From: Nick Burt Date: Wed, 1 Jul 2026 14:47:14 -0500 Subject: [PATCH 15/15] clean up todos and commented code --- lua/custom/plugins/remote-sshfs.lua | 6 ------ lua/custom/plugins/snacks.lua | 24 ------------------------ 2 files changed, 30 deletions(-) diff --git a/lua/custom/plugins/remote-sshfs.lua b/lua/custom/plugins/remote-sshfs.lua index a5937a27..60abac3c 100644 --- a/lua/custom/plugins/remote-sshfs.lua +++ b/lua/custom/plugins/remote-sshfs.lua @@ -1,9 +1,3 @@ --- return { --- 'nosduco/remote-sshfs.nvim', --- dependencies = { 'nvim-telescope/telescope.nvim', 'nvim-lua/plenary.nvim' }, --- opts = {}, --- } - vim.pack.add { "https://github.com/nosduco/remote-sshfs.nvim"} require('remote-sshfs').setup() diff --git a/lua/custom/plugins/snacks.lua b/lua/custom/plugins/snacks.lua index 7018d1d7..82944056 100644 --- a/lua/custom/plugins/snacks.lua +++ b/lua/custom/plugins/snacks.lua @@ -1,29 +1,5 @@ --- return { --- 'folke/snacks.nvim', --- priority = 1000, --- lazy = false, --- ---@type snacks.Config --- opts = { --- dashboard = { enabled = true }, --- gitbrowse = { enabled = true }, --- lazygit = { enabled = true }, --- scratch = { enabled = true }, --- terminal = { enabled = true }, --- }, --- keys = { --- { '=', function() Snacks.dashboard.open() end, desc = 'Dashboard' }, --- { 'gb', function() Snacks.gitbrowse.open() end, desc = 'Open Git Repository in Browser' }, --- { 'gl', function() Snacks.lazygit.open() end, desc = 'Open Lazy Git' }, --- { 'no', function() Snacks.scratch() end, desc = 'Open Notepad' }, --- { 'ns', function() Snacks.scratch.select() end, desc = 'Select Note' }, --- { '', function() Snacks.terminal() end, desc = 'Open Terminal' }, --- }, --- } - --TODO: design a style and features for my dashboard (add opening parent directory with Oil) --TODO: determine a method for deleting scratches easily - ---FIX: postmerge-20260701: Dashboard not working vim.pack.add { 'https://github.com/folke/snacks.nvim' } require('snacks').setup { dashboard = {