Merge upstream/master + add CLAUDE.md#7
Merged
Conversation
Thanks @JackHerby for the report fixes nvim-lua#1995
* Fix descriptions of keymappings * Fix capitalization
Refactor/conform
Refactor/vim.pack
fix: deprecated diagnostic jumping config
Brings in: - fix: deprecated diagnostic jumping config (nvim-lua#1982) - refactor: vim.pack migration (nvim-lua#2005) — already done independently in our fork - mini.ai fixes (example + incremental selection conflict) - refactor: conform — stylua via LSP formatter, format_on_save whitelist (nvim-lua#1991) - gitsigns keymap descriptions (nvim-lua#1997) - fix treesitter indents Conflicts resolved by keeping our 4 personal init.lua lines (have_nerd_font, relativenumber, blink super-tab preset, require 'custom.plugins'), our custom plugin loader, and our .gitignore (.worktrees/ entry).
Documents the two-layer config split (init.lua kept near-identical to upstream, customizations live in lua/custom/plugins/), the loader's deliberate ordering, and the upstream merge workflow. Records the hard rule that PRs always target origin (the fork), never upstream — with explicit `gh pr create --repo` guidance.
- providers.lua: disable Node/Perl/Python3/Ruby remote-plugin hosts we don't use. Kills 6 warnings; unrelated to LSP support for editing files in those languages. - filetypes.lua: register gotmpl/tpl extensions so gopls stops warning about an unknown filetype it advertises support for. - markdown.lua: disable render-markdown's latex feature; we don't write LaTeX math, so skip the latex treesitter parser and utftex/latex2text deps. Kills 3 warnings. - init.lua: switch blink.cmp fuzzy from 'lua' to 'prefer_rust' so it auto-downloads the prebuilt native binary. One additional line of upstream divergence (blink.setup is non-idempotent so this can't be overridden from a custom plugin). Remaining 11 warnings are all expected: 8 mason language warnings (kickstart explicitly says to ignore) and informational notes.
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
4 participants
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
nvim-lua/kickstart.nvim@upstream/masterinto our fork. Upstream commits brought in: deprecated diagnostic-jumping fix (fix: deprecated diagnostic jumping config nvim-lua/kickstart.nvim#1982), upstream'svim.packrefactor (Refactor/vim.pack nvim-lua/kickstart.nvim#2005 — converged with our independent migration), mini.ai fixes, conform refactor (stylua via LSP,format_on_savewhitelist, Refactor/conform nvim-lua/kickstart.nvim#1991), gitsigns keymap descriptions (Fix descriptions of gitsigns keymappings nvim-lua/kickstart.nvim#1997), treesitter indent fix.init.lualines (have_nerd_font,relativenumber, blinksuper-tabpreset,require 'custom.plugins'), our ordered custom-plugin loader, and our.gitignore.README.mdauto-merged with upstream's lazy→vim.pack documentation updates.CLAUDE.mddocumenting the two-layer architecture (init.luakept near-identical to upstream, customizations inlua/custom/plugins/), the loader's deliberate ordering, and the upstream merge workflow. Includes the rule that PRs target this fork, never upstream.Test plan
nvim --headless "+lua print('config loaded ok')" "+qa"passes:checkhealthand confirm no new warnings vs prior state