Extract init.lua customizations to lua/custom/plugins#1994
Closed
bhendo wants to merge 16 commits intonvim-lua:masterfrom
Closed
Extract init.lua customizations to lua/custom/plugins#1994bhendo wants to merge 16 commits intonvim-lua:masterfrom
bhendo wants to merge 16 commits intonvim-lua:masterfrom
Conversation
Pulls in 50 upstream commits. The key driver is the nvim-treesitter migration (upstream 7ea937d, 8ac4b12, a6dcf68, e01e1eb, 4021496, c7f05a0) which switches from the archived `master` branch to `main`, fixing a crash on Neovim 0.12.1 where render-markdown's injection parsing called `:range()` on a table returned by the new query API. Also included from upstream: - Drop mason-lspconfig setup; use `vim.lsp.config/enable` loop directly (upstream ad246eb, 1f4c21f — blink supplies capabilities itself) - Various kickstart plugin cleanups (autopairs, debug, gitsigns, indent_line, lint, neo-tree, health) - stylua config + workflow updates Local customizations preserved: - Custom keymaps and copy_path helper in lua/custom/plugins/init.lua - Extra LSP servers (clangd, gopls, pyright, ts_ls, ruff) - Extra mason tools (markdownlint, mypy, jq, prettier, codelldb) - Enabled kickstart.plugins.{debug,indent_line,lint,autopairs,neo-tree,gitsigns} Post-merge: users must have tree-sitter CLI available (brew install tree-sitter-cli) so the main-branch plugin can recompile parsers against the new query files.
Merge upstream/master: migrate to nvim-treesitter main branch
- Restore pyright inline comments explaining Ruff delegation - Add header comment documenting mason-lspconfig/vim.lsp.config coupling - Unwrap lsp.lua outer spec table (consistency with blink-cmp.lua, conform.lua) - pcall mason-registry.get_package (defensive against unknown package name) - Split inline autocmd opts across lines (style)
Author
|
Opened against wrong base — closing. This is fork-internal refactor work, not intended for upstream. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
init.luainto five new files underlua/custom/plugins/so merging from upstream kickstart only touches a single line.init.luadiff vsupstream/masteris now exactly one line: the{ import = 'custom.plugins' }uncomment.jq,prettier,markdownlintfrom mise global.mypydropped (unused in config).What moved where
blink.cmppreset = 'super-tab'lua/custom/plugins/blink-cmp.luaconform.nvimformatters_by_ft(9 filetypes)lua/custom/plugins/conform.luadebug,indent_line,lint,autopairs,neo-tree,gitsigns)lua/custom/plugins/kickstart-enable.luaclangd,gopls,pyright,ts_ls,ruff) + pyright's Ruff-delegation settingslua/custom/plugins/lsp.luacodelldbauto-install (ships as.vsix, can't go through mise)lua/custom/plugins/mason-extras.luaMechanisms
blink-cmp.lua/conform.luarely on lazy.nvim'soptsdeep-merge across duplicate plugin specs.lsp.luaadds a second spec formason-lspconfig.nvim(kickstart declares it as a bare dep), triggeringsetup(opts)withensure_installed+automatic_enable = true.vim.lsp.config('pyright', ...)runs as a top-level side effect during spec import, before mason-lspconfig enables pyright.mason-extras.luauses aUser VeryLazyautocmd +mason-registryAPI to installcodelldbonce.Docs
docs/superpowers/specs/2026-04-14-nvim-config-refactor-design.mddocs/superpowers/plans/2026-04-14-extract-customizations.md(These are currently untracked; let me know if you want them committed on a follow-up.)
Test plan
nvimstarts cleanly (:messagesempty):Lazylists all expected plugins:checkhealth vim.lspshowsclangd/gopls/pyright/ts_ls/ruffattached on relevant filetypes:lua =vim.lsp.get_clients({name='pyright'})[1].config.settingsincludesdisableOrganizeImportsandignore = { '*' }:Masonlistslua_ls,stylua, and (after startup)codelldb$PATHinside nvim findsjq,prettier,markdownlintfrom mise<Tab>accepts ablink.cmpcompletion<leader>fformats JSON / Python / YAML / markdown / TS files]cjumps to next gitsigns hunk on a modified filegit diff upstream/master HEAD -- init.luashows only the{ import = 'custom.plugins' }uncomment