Backmerge by ralvescosta · Pull Request #2006 · nvim-lua/kickstart.nvim

ralvescosta · 2026-04-20T10:49:49Z

NOTE
Please verify that the base repository above has the intended destination!
Github by default opens Pull Requests against the parent of a forked repository.
If this is your personal fork and you didn't intend to open a PR for contribution
to the original project then adjust the base repository accordingly.

Copilot

Pull request overview

This PR backmerges and restructures the Neovim configuration into a modular Kickstart-style layout, adds/adjusts plugin configurations (LSP, DAP, formatting, linting, UI), and introduces spelling/cspell configuration and dictionaries.

Changes:

Modularize core config: split options and keymaps into lua/kickstart/* and load plugins via Lazy imports.
Add/update plugin specs and custom plugins for development workflow (LSP, DAP, formatting, linting, telescope, UI, testing).
Add spell/cspell configuration and word lists; start tracking lazy-lock.json.

Reviewed changes

Copilot reviewed 35 out of 37 changed files in this pull request and generated 13 comments.

Show a summary per file

File	Description
spell/en.utf-8.add.spl	Adds a compiled Vim spell file artifact.
spell/en.utf-8.add	Adds custom spelling word list.
spell/cspell.json	Adds cspell configuration and dictionary definition.
lua/kickstart/plugins/which-key.lua	Adds which-key plugin configuration.
lua/kickstart/plugins/vim-sleuth.lua	Adds guess-indent plugin spec (file kept under vim-sleuth name).
lua/kickstart/plugins/treesitter.lua	Adds/updates treesitter config and language list.
lua/kickstart/plugins/todo-comments.lua	Adds todo-comments plugin spec.
lua/kickstart/plugins/theme.lua	Adds tokyonight theme configuration.
lua/kickstart/plugins/telescope.lua	Adds telescope configuration + keymaps.
lua/kickstart/plugins/nvim-cmp.lua	Adds nvim-cmp completion configuration.
lua/kickstart/plugins/neo-tree.lua	Updates neo-tree behavior (filters/follow/renderers).
lua/kickstart/plugins/mini.lua	Adds mini.nvim module configuration.
lua/kickstart/plugins/lspconfig.lua	Adds LSP + Mason tool installation configuration.
lua/kickstart/plugins/lint.lua	Expands linting to include cspell across filetypes.
lua/kickstart/plugins/lazydev.lua	Adds lazydev config for Lua dev.
lua/kickstart/plugins/indent_line.lua	Updates indent-blankline/ibl configuration.
lua/kickstart/plugins/gitsigns.lua	Updates gitsigns visuals and watcher behavior.
lua/kickstart/plugins/debug.lua	Updates DAP setup, keymaps, and Mason dependency.
lua/kickstart/plugins/conform.lua	Adds conform.nvim formatting configuration.
lua/kickstart/options.lua	Moves/editor options into module; adds custom spell/fold/autocmd settings.
lua/kickstart/mappings.lua	Moves keymaps/autocmds into module; adds custom buffer/line-move mappings.
lua/custom/plugins/toggleterm.lua	Adds toggleterm plugin and keymaps.
lua/custom/plugins/rustaceanvim.lua	Adds rustaceanvim configuration including DAP integration.
lua/custom/plugins/rust.lua	Adds rust.vim ft plugin settings.
lua/custom/plugins/rust-crates.lua	Adds crates.nvim integration with cmp.
lua/custom/plugins/nvim-dap-go.lua	Adds Go DAP configuration with dynamic args/env.
lua/custom/plugins/neotest.lua	Adds neotest setup + keymaps for Go/Rust adapters.
lua/custom/plugins/lualine.lua	Adds lualine theme/config.
lua/custom/plugins/lazygit.lua	Adds lazygit integration and refresh hook for neo-tree.
lua/custom/plugins/hop.lua	Adds hop.nvim keymaps for f/F/t/T motions.
lua/custom/plugins/copilot.lua	Adds Copilot plugin configuration and toggle keymap.
lua/custom/plugins/bufferline.lua	Adds (commented-out) bufferline plugin config scaffold.
lua/custom/plugins/avante.lua	Adds avante.nvim configuration and dependencies.
lazy-lock.json	Adds lockfile to pin plugin versions.
init.lua	Simplifies init; loads modules and imports plugin groups via Lazy.
README.md	Updates project branding and install instructions.
.gitignore	Stops ignoring `spell/` and `lazy-lock.json` so they can be tracked.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-04-20T10:56:32Z

-```
-
-</details>
+git clone https://github.com:ralvescosta/nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim


The clone URL is not a valid HTTPS GitHub URL (https://github.com:ralvescosta/nvim.git). Use either the HTTPS form (https://github.com/ralvescosta/nvim.git) or the SSH form (git@github.com:ralvescosta/nvim.git).

Suggested change

git clone https://github.com:ralvescosta/nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim

git clone https://github.com/ralvescosta/nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim

Copilot · 2026-04-20T10:56:32Z

 ```sh
-git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
-```
-
-</details>
-
-<details><summary> Windows </summary>
-
-If you're using `cmd.exe`:
-
-```
-git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
-```
-
-If you're using `powershell.exe`
-
-```
-git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
-```
-
-</details>
+git clone https://github.com:ralvescosta/nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim

 ### Post Installation


The fenced code block opened for the git clone command is not closed, so the rest of the README will render as code. Add a closing triple-backtick after the clone command.

Copilot · 2026-04-20T10:56:33Z

+    'mrcjkb/rustaceanvim',
+    version = '^6',
+    lazy = false,
+    pft = 'rust',


pft = 'rust' is not a recognized Lazy.nvim plugin spec key (likely meant ft). If the intent is filetype-based loading, use ft; otherwise remove the typo to avoid confusion.

Suggested change

pft = 'rust',

ft = 'rust',

Copilot · 2026-04-20T10:56:33Z

+      local mason_registry = require 'mason-registry'
+


local mason_registry = require 'mason-registry' is unused and also creates a hard runtime dependency on Mason being loaded before this plugin config runs. Since the value isn't used, remove the require (or declare Mason as an explicit dependency if it’s actually needed).

Suggested change

local mason_registry = require 'mason-registry'

Copilot · 2026-04-20T10:56:33Z

+  end,
+})
+-- ##########################
+-- #### RESETTING SQL KEY BIDING


Typo in comment: "BIDING" should be "BINDING".

Suggested change

-- #### RESETTING SQL KEY BIDING

-- #### RESETTING SQL KEY BINDING

Copilot · 2026-04-20T10:56:34Z

+      vim.keymap.set('n', '<leader>rf', "<cmd>lua require('neotest').run.run(vim.fn.expand('%'))<CR>", { desc = '[R]un entire file' })
+      vim.keymap.set('n', '<leader>dt', "<cmd>lua require('neotest').run.run({ strategy = 'dap' })<CR>", { desc = 'Debug [N]earest test' })
+      vim.keymap.set('n', ']t', "<cmd>lua require('neotest').jump.next({ status = 'failed' })<CR>", { desc = 'Jump to the next failed test' })
+      vim.keymap.set('n', '[t', "require('neotest').jump.prev({ status = 'failed' })<CR>", { desc = 'Jump to the previous failed test' })


The [t mapping is missing the <cmd>lua ...<CR> wrapper (unlike the other neotest mappings). As written, it will try to execute require('neotest')... as an Ex command and fail.

Suggested change

vim.keymap.set('n', '[t', "require('neotest').jump.prev({ status = 'failed' })<CR>", { desc = 'Jump to the previous failed test' })

vim.keymap.set('n', '[t', "<cmd>lua require('neotest').jump.prev({ status = 'failed' })<CR>", { desc = 'Jump to the previous failed test' })

Copilot · 2026-04-20T10:56:35Z

+    config = function()
+      require('crates').setup {
+        completion = {
+          cmp = {
+            enabled = true,
+          },
+        },
+      }
+      require('cmp').setup.buffer {
+        sources = { { name = 'crates' } },
+      }


This config unconditionally calls require('cmp') when crates.nvim loads on ft=toml, but nvim-cmp is configured to load on InsertEnter. Opening a TOML file before entering insert mode will error. Add hrsh7th/nvim-cmp as a dependency here and/or defer the buffer source setup until cmp is available (pcall / event).

Copilot · 2026-04-20T10:56:35Z


    -- Installs the debug adapters for you
-    'williamboman/mason.nvim',
+    'mason-org/mason.nvim',


This uses mason-org/mason.nvim while the LSP setup depends on williamboman/mason.nvim (see lua/kickstart/plugins/lspconfig.lua). Loading two different Mason repos under the same plugin name can cause lockfile and runtime issues; please standardize on a single Mason source across the config.

Suggested change

'mason-org/mason.nvim',

'williamboman/mason.nvim',

Copilot · 2026-04-20T10:56:35Z

+      inactive = {
+        a = { bg = colors.inactive_bg, fg = colors.semilightgray, gui = 'bold' },
+        b = { bg = colors.inactive_bg, fg = colors.semilightgray },
+        c = { bg = colors.inactive_bg, fg = colors.semilightgray },
+      },


colors.semilightgray is referenced but not defined in the colors table, so these inactive section colors will be nil and may break lualine theme rendering. Define semilightgray (or use an existing color key) before using it.

Copilot · 2026-04-20T10:56:36Z

@@ -0,0 +1,6 @@
+return {
+  -- EditorConfig to use this we need to have the .editorocnfig file configured


Typo in comment: .editorocnfig should be .editorconfig.

ralvescosta added 30 commits March 16, 2025 15:30

feat: kickstart plugins and custom plugins

2a6c3fd

feat: removing rust analyzer

48a21c4

feat: hop ocnfigs

58e8cdd

feat: lazygit config

77f63ea

feat:ident

f056d71

feat: disabled opt.list to improve go files

15ec6fe

feat: maps

d729bec

feat: dap-go

7d37624

feat: bufferline tabs

e2cfbaa

feat: toggleterm

24e70c9

feat: cspell lints

537f989

feat: theme transparent

846b4c3

feat:

f3f5d1c

feat: spells

64b54d4

feat:

4ad72fc

feat: lualine

96f6ac6

feat: theme

cf5887e

feat: lazy config

38be632

feat: add rustaceanvim lsp config

0882efd

feat: neo-vim

9de0a71

feat: avante

174d7d2

feat: adjust lazygit map

64192db

feat vim maximizer

91cf245

feat: neo-tree

3d8bb61

feat: spells

10cdfdf

feat: remove unused code

a3b0367

feat: neo-tree

82aafd2

feat: terroform higligth

1dcd891

feat: TS

ba76695

feat: spells

c568b79

ralvescosta added 26 commits May 19, 2025 18:42

feat: update lazy

523ce46

feat: lazy

6da7694

feat: updates

434e0c6

fix: new mason installation path

088dca4

feat: update versions

e00e376

feat: update rustaceanvim version

d84ee45

feat: custom ia plugins

35f507e

chore: update pkgs

dd64210

feat: update lzay and spells

5855e33

feat: update pkgs

91d593e

feat: update pkgs

6f05eae

feat: update avante config

78ead72

feat: update pkgs

a4932d3

feat: update pkgs

d38396a

feat: update pkgs

31bb1e1

update pkgs

aa4589d

chore: updatep pkgs

6169755

chore: updatep pkgs

147dffb

feat: update pkgs

837a234

chore: updatep pkgs

6c7be74

chore: updatep pkgs

b046383

update pkgs

f27103d

updated pkgs

1add676

fix: update treesitter config to use setup function

75a73ea

chore: update pkgs

7528de4

update lazy dependecies

f2e5706

Copilot AI review requested due to automatic review settings April 20, 2026 10:49

Copilot started reviewing on behalf of ralvescosta April 20, 2026 10:50 View session

ralvescosta closed this Apr 20, 2026

Copilot AI reviewed Apr 20, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Backmerge#2006

Backmerge#2006
ralvescosta wants to merge 107 commits intonvim-lua:masterfrom
ralvescosta:master

ralvescosta commented Apr 20, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	git clone https://github.com:ralvescosta/nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
	git clone https://github.com/ralvescosta/nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim

	-- #### RESETTING SQL KEY BIDING
	-- #### RESETTING SQL KEY BINDING

	vim.keymap.set('n', '[t', "require('neotest').jump.prev({ status = 'failed' })<CR>", { desc = 'Jump to the previous failed test' })
	vim.keymap.set('n', '[t', "<cmd>lua require('neotest').jump.prev({ status = 'failed' })<CR>", { desc = 'Jump to the previous failed test' })

		@@ -0,0 +1,6 @@
		return {
		-- EditorConfig to use this we need to have the .editorocnfig file configured

Conversation

ralvescosta commented Apr 20, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants