diff --git a/lua/plugins/kickstart/autocmds.lua b/lua/config/autocmds.lua similarity index 73% rename from lua/plugins/kickstart/autocmds.lua rename to lua/config/autocmds.lua index fd3b2f21..5206f6e5 100644 --- a/lua/plugins/kickstart/autocmds.lua +++ b/lua/config/autocmds.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/autocmds.lua - Module: plugins.kickstart.autocmds + Path: lua/config/autocmds.lua + Module: config.autocmds Purpose Small, global autocommand hooks: yank highlight feedback and safer defaults @@ -15,12 +15,12 @@ vim.api.nvim_create_autocmd('TextYankPost', { desc = 'Highlight when yanking (copying) text', - group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), + group = vim.api.nvim_create_augroup('config-highlight-yank', { clear = true }), callback = function() vim.hl.on_yank() end, }) vim.api.nvim_create_autocmd('FileType', { - group = vim.api.nvim_create_augroup('kickstart-markdown-safe-read', { clear = true }), + group = vim.api.nvim_create_augroup('config-markdown-safe-read', { clear = true }), pattern = 'markdown', callback = function() vim.opt_local.modeline = false diff --git a/lua/plugins/kickstart/diagnostics.lua b/lua/config/diagnostics.lua similarity index 93% rename from lua/plugins/kickstart/diagnostics.lua rename to lua/config/diagnostics.lua index f9f21ee0..619d9e19 100644 --- a/lua/plugins/kickstart/diagnostics.lua +++ b/lua/config/diagnostics.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/diagnostics.lua - Module: plugins.kickstart.diagnostics + Path: lua/config/diagnostics.lua + Module: config.diagnostics Purpose One global `vim.diagnostic.config` for how LSP diagnostics render: signs, diff --git a/lua/plugins/kickstart/health.lua b/lua/config/health.lua similarity index 93% rename from lua/plugins/kickstart/health.lua rename to lua/config/health.lua index 01fa319d..9b32955a 100644 --- a/lua/plugins/kickstart/health.lua +++ b/lua/config/health.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/health.lua - Module: plugins.kickstart.health + Path: lua/config/health.lua + Module: config.health Purpose Optional `:checkhealth` provider: Neovim version gate, common CLI tools @@ -42,7 +42,7 @@ end return { check = function() - vim.health.start 'kickstart.nvim' + vim.health.start 'nvim configuration' vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth` diff --git a/lua/plugins/kickstart/init.lua b/lua/config/init.lua similarity index 71% rename from lua/plugins/kickstart/init.lua rename to lua/config/init.lua index 27ff215c..68d48b3c 100644 --- a/lua/plugins/kickstart/init.lua +++ b/lua/config/init.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/init.lua - Module: plugins.kickstart + Path: lua/config/init.lua + Module: config Purpose Orchestrates core editor setup: globals, options, keymaps, autocommands, @@ -20,8 +20,8 @@ vim.g.maplocalleader = ' ' vim.g.have_nerd_font = true -require 'plugins.kickstart.options' -require 'plugins.kickstart.keymaps' -require 'plugins.kickstart.autocmds' -require 'plugins.kickstart.diagnostics' -require 'plugins.kickstart.lazy' +require 'config.options' +require 'config.keymaps' +require 'config.autocmds' +require 'config.diagnostics' +require 'config.lazy' diff --git a/lua/plugins/kickstart/keymaps.lua b/lua/config/keymaps.lua similarity index 95% rename from lua/plugins/kickstart/keymaps.lua rename to lua/config/keymaps.lua index 5c7fa4e7..af6bd8b4 100644 --- a/lua/plugins/kickstart/keymaps.lua +++ b/lua/config/keymaps.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/keymaps.lua - Module: plugins.kickstart.keymaps + Path: lua/config/keymaps.lua + Module: config.keymaps Purpose Non-plugin (or minimally coupled) normal-mode maps: search, diagnostics diff --git a/lua/plugins/kickstart/lazy.lua b/lua/config/lazy.lua similarity index 89% rename from lua/plugins/kickstart/lazy.lua rename to lua/config/lazy.lua index ae2d9fec..2fecac63 100644 --- a/lua/plugins/kickstart/lazy.lua +++ b/lua/config/lazy.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/lazy.lua - Module: plugins.kickstart.lazy + Path: lua/config/lazy.lua + Module: config.lazy Purpose Bootstraps folke/lazy.nvim if missing, prepends it to runtimepath, and calls @@ -24,7 +24,7 @@ end local rtp = vim.opt.rtp rtp:prepend(lazypath) -require('lazy').setup(require 'plugins.kickstart.plugins.spec', { +require('lazy').setup(require 'config.plugins.spec', { ui = { icons = vim.g.have_nerd_font and {} or { cmd = '⌘', diff --git a/lua/plugins/kickstart/options.lua b/lua/config/options.lua similarity index 92% rename from lua/plugins/kickstart/options.lua rename to lua/config/options.lua index 533aacba..757bebd1 100644 --- a/lua/plugins/kickstart/options.lua +++ b/lua/config/options.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/options.lua - Module: plugins.kickstart.options + Path: lua/config/options.lua + Module: config.options Purpose Sets buffer-agnostic Neovim options (`vim.o` / `vim.opt`): editing feel, diff --git a/lua/plugins/kickstart/plugins/autopairs.lua b/lua/config/plugins/autopairs.lua similarity index 83% rename from lua/plugins/kickstart/plugins/autopairs.lua rename to lua/config/plugins/autopairs.lua index 35f759c2..88b79b87 100644 --- a/lua/plugins/kickstart/plugins/autopairs.lua +++ b/lua/config/plugins/autopairs.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/autopairs.lua - Module: plugins.kickstart.plugins.autopairs + Path: lua/config/plugins/autopairs.lua + Module: config.plugins.autopairs Purpose Lazy spec for nvim-autopairs: inserts/closes paired brackets and quotes in diff --git a/lua/plugins/kickstart/plugins/blink.lua b/lua/config/plugins/blink.lua similarity index 97% rename from lua/plugins/kickstart/plugins/blink.lua rename to lua/config/plugins/blink.lua index d3b6a1b0..436cab50 100644 --- a/lua/plugins/kickstart/plugins/blink.lua +++ b/lua/config/plugins/blink.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/blink.lua - Module: plugins.kickstart.plugins.blink + Path: lua/config/plugins/blink.lua + Module: config.plugins.blink Purpose Lazy spec for saghen/blink.cmp: completion menu, LSP source, snippets via diff --git a/lua/plugins/kickstart/plugins/conform.lua b/lua/config/plugins/conform.lua similarity index 94% rename from lua/plugins/kickstart/plugins/conform.lua rename to lua/config/plugins/conform.lua index b6a7b61e..9af5706e 100644 --- a/lua/plugins/kickstart/plugins/conform.lua +++ b/lua/config/plugins/conform.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/conform.lua - Module: plugins.kickstart.plugins.conform + Path: lua/config/plugins/conform.lua + Module: config.plugins.conform Purpose Lazy spec for conform.nvim: formatter orchestration (`f`), per-FT diff --git a/lua/plugins/kickstart/plugins/debug.lua b/lua/config/plugins/debug.lua similarity index 98% rename from lua/plugins/kickstart/plugins/debug.lua rename to lua/config/plugins/debug.lua index 403c8759..82b149f9 100644 --- a/lua/plugins/kickstart/plugins/debug.lua +++ b/lua/config/plugins/debug.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/debug.lua - Module: plugins.kickstart.plugins.debug + Path: lua/config/plugins/debug.lua + Module: config.plugins.debug Purpose Lazy spec for nvim-dap + nvim-dap-ui + mason-nvim-dap + nvim-dap-go: debug diff --git a/lua/plugins/kickstart/plugins/gitsigns.lua b/lua/config/plugins/gitsigns.lua similarity index 97% rename from lua/plugins/kickstart/plugins/gitsigns.lua rename to lua/config/plugins/gitsigns.lua index 53b55e05..abedb469 100644 --- a/lua/plugins/kickstart/plugins/gitsigns.lua +++ b/lua/config/plugins/gitsigns.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/gitsigns.lua - Module: plugins.kickstart.plugins.gitsigns + Path: lua/config/plugins/gitsigns.lua + Module: config.plugins.gitsigns Purpose Lazy spec for lewis6991/gitsigns.nvim: gutter hunks, stage/reset, blame, diff --git a/lua/plugins/kickstart/plugins/guess_indent.lua b/lua/config/plugins/guess_indent.lua similarity index 80% rename from lua/plugins/kickstart/plugins/guess_indent.lua rename to lua/config/plugins/guess_indent.lua index 813febcb..3b3fd6f0 100644 --- a/lua/plugins/kickstart/plugins/guess_indent.lua +++ b/lua/config/plugins/guess_indent.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/guess_indent.lua - Module: plugins.kickstart.plugins.guess_indent + Path: lua/config/plugins/guess_indent.lua + Module: config.plugins.guess_indent Purpose Lazy spec for guess-indent.nvim: detects indentation style per buffer so new diff --git a/lua/plugins/kickstart/plugins/indent_line.lua b/lua/config/plugins/indent_line.lua similarity index 84% rename from lua/plugins/kickstart/plugins/indent_line.lua rename to lua/config/plugins/indent_line.lua index 38b17000..0d3006be 100644 --- a/lua/plugins/kickstart/plugins/indent_line.lua +++ b/lua/config/plugins/indent_line.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/indent_line.lua - Module: plugins.kickstart.plugins.indent_line + Path: lua/config/plugins/indent_line.lua + Module: config.plugins.indent_line Purpose Lazy spec for indent-blankline.nvim (`ibl`): optional vertical guides aligned diff --git a/lua/plugins/kickstart/plugins/lint.lua b/lua/config/plugins/lint.lua similarity index 96% rename from lua/plugins/kickstart/plugins/lint.lua rename to lua/config/plugins/lint.lua index 4c5d5b04..08d438ce 100644 --- a/lua/plugins/kickstart/plugins/lint.lua +++ b/lua/config/plugins/lint.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/lint.lua - Module: plugins.kickstart.plugins.lint + Path: lua/config/plugins/lint.lua + Module: config.plugins.lint Purpose Lazy spec for nvim-lint: asynchronous linters per filetype (here Markdown diff --git a/lua/plugins/kickstart/plugins/lsp.lua b/lua/config/plugins/lsp.lua similarity index 96% rename from lua/plugins/kickstart/plugins/lsp.lua rename to lua/config/plugins/lsp.lua index 73faf10a..6c725074 100644 --- a/lua/plugins/kickstart/plugins/lsp.lua +++ b/lua/config/plugins/lsp.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/lsp.lua - Module: plugins.kickstart.plugins.lsp + Path: lua/config/plugins/lsp.lua + Module: config.plugins.lsp Purpose Lazy spec for nvim-lspconfig + Mason + blink.cmp integration: LspAttach @@ -44,7 +44,7 @@ return { -- LspAttach: buffer-local LSP maps and optional semantic highlight / inlay hints. -- See :help LspAttach, :help lsp-vs-treesitter vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), + group = vim.api.nvim_create_augroup('config-lsp-attach', { clear = true }), callback = function(event) -- NOTE: Remember that Lua is a real programming language, and as such it is possible -- to define small helper and utility functions so you don't have to repeat yourself. @@ -72,7 +72,7 @@ return { -- before VimEnter, when lazy.nvim has not loaded telescope.nvim yet. -- -- Nvim 0.11+ sets *global* defaults grr/gri/grt/gO → vim.lsp.buf.* (quickfix / loclist). - -- Buffer-local maps override. Match kickstart.nvim: grr gri grd gO gW grt (see telescope + -- Buffer-local maps override defaults; grr/gri/grd/gO/gW/grt use Telescope pickers. -- LspAttach in upstream). `grd` is not a core default — it was only in your fork/telescope. map('grr', function() require('telescope.builtin').lsp_references() end, '[R]eferences') map('gri', function() require('telescope.builtin').lsp_implementations() end, '[I]mplementation') @@ -118,7 +118,7 @@ return { -- -- When you move your cursor, the highlights will be cleared (the second autocommand). if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_documentHighlight, event.buf) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) + local highlight_augroup = vim.api.nvim_create_augroup('config-lsp-highlight', { clear = false }) vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { buffer = event.buf, group = highlight_augroup, @@ -132,10 +132,10 @@ return { }) vim.api.nvim_create_autocmd('LspDetach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), + group = vim.api.nvim_create_augroup('config-lsp-detach', { clear = true }), callback = function(event2) vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } + vim.api.nvim_clear_autocmds { group = 'config-lsp-highlight', buffer = event2.buf } end, }) end @@ -145,7 +145,7 @@ return { -- -- This may be unwanted, since they displace some of your code if client and client_supports_method(client, vim.lsp.protocol.Methods.textDocument_inlayHint, event.buf) then - -- `th` is used in keymaps.lua for terminal horizontal split. + -- `th` is used in `config.keymaps` for terminal horizontal split. map('ti', function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) end, '[T]oggle [I]nlay hints') end end, diff --git a/lua/plugins/kickstart/plugins/mini.lua b/lua/config/plugins/mini.lua similarity index 95% rename from lua/plugins/kickstart/plugins/mini.lua rename to lua/config/plugins/mini.lua index cdbf970b..a6791323 100644 --- a/lua/plugins/kickstart/plugins/mini.lua +++ b/lua/config/plugins/mini.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/mini.lua - Module: plugins.kickstart.plugins.mini + Path: lua/config/plugins/mini.lua + Module: config.plugins.mini Purpose Lazy spec for nvim-mini/mini.nvim: loads `mini.ai`, `mini.surround`, and diff --git a/lua/plugins/kickstart/plugins/mini_icons.lua b/lua/config/plugins/mini_icons.lua similarity index 84% rename from lua/plugins/kickstart/plugins/mini_icons.lua rename to lua/config/plugins/mini_icons.lua index c70cb3e1..f2cf54ca 100644 --- a/lua/plugins/kickstart/plugins/mini_icons.lua +++ b/lua/config/plugins/mini_icons.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/mini_icons.lua - Module: plugins.kickstart.plugins.mini_icons + Path: lua/config/plugins/mini_icons.lua + Module: config.plugins.mini_icons Purpose Lazy spec for mini.icons: consistent glyphs/highlights for special filenames diff --git a/lua/plugins/kickstart/plugins/neo-tree.lua b/lua/config/plugins/neo-tree.lua similarity index 92% rename from lua/plugins/kickstart/plugins/neo-tree.lua rename to lua/config/plugins/neo-tree.lua index 2b0ae0c0..4f75fb8c 100644 --- a/lua/plugins/kickstart/plugins/neo-tree.lua +++ b/lua/config/plugins/neo-tree.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/neo-tree.lua - Module: plugins.kickstart.plugins.neo-tree + Path: lua/config/plugins/neo-tree.lua + Module: config.plugins.neo-tree Purpose Lazy spec for nvim-neo-tree/neo-tree.nvim: filesystem sidebar, reveal/toggle diff --git a/lua/plugins/kickstart/plugins/render_markdown.lua b/lua/config/plugins/render_markdown.lua similarity index 86% rename from lua/plugins/kickstart/plugins/render_markdown.lua rename to lua/config/plugins/render_markdown.lua index 352b5cf6..7aa703b4 100644 --- a/lua/plugins/kickstart/plugins/render_markdown.lua +++ b/lua/config/plugins/render_markdown.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/render_markdown.lua - Module: plugins.kickstart.plugins.render_markdown + Path: lua/config/plugins/render_markdown.lua + Module: config.plugins.render_markdown Purpose Lazy spec for render-markdown.nvim: in-buffer Markdown preview (no external diff --git a/lua/config/plugins/spec.lua b/lua/config/plugins/spec.lua new file mode 100644 index 00000000..b009df89 --- /dev/null +++ b/lua/config/plugins/spec.lua @@ -0,0 +1,59 @@ +--[[ + Path: lua/config/plugins/spec.lua + Module: config.plugins.spec + + Purpose + Builds the complete lazy.nvim plugin list: requires each per-plugin module, + normalizes return shapes (single spec vs. `{ spec }`), and returns one flat + `LazySpec` array for `lazy.setup()`. + + Rationale + Splitting each plugin into its own file keeps diffs small and matches how + lazy.nvim expects multiple tables to be merged at setup time. + + See `:help lazy.nvim-plugin-spec`, `:help LazySpec`. +]] + +---@param out table +---@param chunk LazySpec|LazySpec[] +local function append_specs(out, chunk) + if type(chunk[1]) == 'string' then + out[#out + 1] = chunk + return + end + for i = 1, #chunk do + out[#out + 1] = chunk[i] + end +end + +---@type LazySpec +local specs = {} +local mods = { + 'config.plugins.guess_indent', + 'config.plugins.gitsigns', + 'config.plugins.which_key', + 'config.plugins.render_markdown', + 'config.plugins.telescope', + 'config.plugins.lsp', + 'config.plugins.conform', + 'config.plugins.blink', + 'config.plugins.tokyonight', + 'config.plugins.todo_comments', + 'config.plugins.mini', + 'config.plugins.treesitter', + 'config.plugins.vim_helm', + 'config.plugins.toggleterm', + 'config.plugins.mini_icons', + 'config.plugins.debug', + 'config.plugins.indent_line', + 'config.plugins.lint', + 'config.plugins.autopairs', + 'config.plugins.neo-tree', + 'custom.plugins', +} + +for _, mod in ipairs(mods) do + append_specs(specs, require(mod)) +end + +return specs diff --git a/lua/plugins/kickstart/plugins/telescope.lua b/lua/config/plugins/telescope.lua similarity index 98% rename from lua/plugins/kickstart/plugins/telescope.lua rename to lua/config/plugins/telescope.lua index 8bcc684b..18b86d2f 100644 --- a/lua/plugins/kickstart/plugins/telescope.lua +++ b/lua/config/plugins/telescope.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/telescope.lua - Module: plugins.kickstart.plugins.telescope + Path: lua/config/plugins/telescope.lua + Module: config.plugins.telescope Purpose Lazy spec for telescope.nvim: fuzzy finder for files, grep, diagnostics, diff --git a/lua/plugins/kickstart/plugins/todo_comments.lua b/lua/config/plugins/todo_comments.lua similarity index 85% rename from lua/plugins/kickstart/plugins/todo_comments.lua rename to lua/config/plugins/todo_comments.lua index 9e75d49a..ebd51cc5 100644 --- a/lua/plugins/kickstart/plugins/todo_comments.lua +++ b/lua/config/plugins/todo_comments.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/todo_comments.lua - Module: plugins.kickstart.plugins.todo_comments + Path: lua/config/plugins/todo_comments.lua + Module: config.plugins.todo_comments Purpose Lazy spec for todo-comments.nvim: highlights TODO/FIXME/HACK-style comment diff --git a/lua/plugins/kickstart/plugins/toggleterm.lua b/lua/config/plugins/toggleterm.lua similarity index 75% rename from lua/plugins/kickstart/plugins/toggleterm.lua rename to lua/config/plugins/toggleterm.lua index 1edfc246..16e0c716 100644 --- a/lua/plugins/kickstart/plugins/toggleterm.lua +++ b/lua/config/plugins/toggleterm.lua @@ -1,10 +1,10 @@ --[[ - Path: lua/plugins/kickstart/plugins/toggleterm.lua - Module: plugins.kickstart.plugins.toggleterm + Path: lua/config/plugins/toggleterm.lua + Module: config.plugins.toggleterm Purpose Lazy spec for akinsho/toggleterm.nvim: floating terminal and the `:ToggleTerm` - command used by `tf` in `plugins.kickstart.keymaps`. + command used by `tf` in `config.keymaps`. Rationale Keymaps referenced ToggleTerm without a plugin; this wires the dependency. diff --git a/lua/plugins/kickstart/plugins/tokyonight.lua b/lua/config/plugins/tokyonight.lua similarity index 92% rename from lua/plugins/kickstart/plugins/tokyonight.lua rename to lua/config/plugins/tokyonight.lua index c63e7642..1ffed72d 100644 --- a/lua/plugins/kickstart/plugins/tokyonight.lua +++ b/lua/config/plugins/tokyonight.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/tokyonight.lua - Module: plugins.kickstart.plugins.tokyonight + Path: lua/config/plugins/tokyonight.lua + Module: config.plugins.tokyonight Purpose Lazy spec for tokyonight.nvim: colorscheme plugin with high priority so it diff --git a/lua/plugins/kickstart/plugins/treesitter.lua b/lua/config/plugins/treesitter.lua similarity index 95% rename from lua/plugins/kickstart/plugins/treesitter.lua rename to lua/config/plugins/treesitter.lua index 92fc4972..ec1c7270 100644 --- a/lua/plugins/kickstart/plugins/treesitter.lua +++ b/lua/config/plugins/treesitter.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/treesitter.lua - Module: plugins.kickstart.plugins.treesitter + Path: lua/config/plugins/treesitter.lua + Module: config.plugins.treesitter Purpose Lazy spec for nvim-treesitter: parser install list, `TSUpdate` build step, diff --git a/lua/plugins/kickstart/plugins/vim_helm.lua b/lua/config/plugins/vim_helm.lua similarity index 85% rename from lua/plugins/kickstart/plugins/vim_helm.lua rename to lua/config/plugins/vim_helm.lua index ed8f5402..dd6eddd6 100644 --- a/lua/plugins/kickstart/plugins/vim_helm.lua +++ b/lua/config/plugins/vim_helm.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/vim_helm.lua - Module: plugins.kickstart.plugins.vim_helm + Path: lua/config/plugins/vim_helm.lua + Module: config.plugins.vim_helm Purpose Lazy spec for towolf/vim-helm: sets `filetype=helm` on Helm templates so diff --git a/lua/plugins/kickstart/plugins/which_key.lua b/lua/config/plugins/which_key.lua similarity index 92% rename from lua/plugins/kickstart/plugins/which_key.lua rename to lua/config/plugins/which_key.lua index 6e42b211..c8a2f9e6 100644 --- a/lua/plugins/kickstart/plugins/which_key.lua +++ b/lua/config/plugins/which_key.lua @@ -1,6 +1,6 @@ --[[ - Path: lua/plugins/kickstart/plugins/which_key.lua - Module: plugins.kickstart.plugins.which_key + Path: lua/config/plugins/which_key.lua + Module: config.plugins.which_key Purpose Lazy spec for which-key.nvim: discoverable pop-up of pending key sequences diff --git a/lua/custom/git_links.lua b/lua/custom/git_links.lua index 5b547b66..b4bbcce9 100644 --- a/lua/custom/git_links.lua +++ b/lua/custom/git_links.lua @@ -7,7 +7,7 @@ browser, including a line or range anchor from Normal or Visual mode. Rationale - Small, focused utility used by `plugins.kickstart.keymaps` (`go`). + Small, focused utility used by `config.keymaps` (`go`). Kept under `custom/` so it stays clearly “yours” vs. generated plugin specs. Dependencies: git(1); `vim.ui.open` on Nvim 0.10+, else `open` / `xdg-open` / `cmd start`. diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua index 50c494f5..de9d2ecb 100644 --- a/lua/custom/plugins/init.lua +++ b/lua/custom/plugins/init.lua @@ -3,13 +3,13 @@ Module: custom.plugins Purpose - Lazy.nvim specs for plugins that are not part of the main `plugins.kickstart` + Lazy.nvim specs for plugins that are not part of the main `config` tree (e.g. HTTP client, experimental additions). Rationale - `plugins.kickstart.plugins.spec` appends this module last so your personal + `config.plugins.spec` appends this module last so your personal plugins stay merge-friendly and easy to find. Neo-tree and core stack live - under `plugins.kickstart.plugins` instead. + under `config.plugins` instead. See `:help lazy.nvim-plugin-spec`. ]] diff --git a/lua/plugins/kickstart/plugins/spec.lua b/lua/plugins/kickstart/plugins/spec.lua deleted file mode 100644 index 3767e2b9..00000000 --- a/lua/plugins/kickstart/plugins/spec.lua +++ /dev/null @@ -1,59 +0,0 @@ ---[[ - Path: lua/plugins/kickstart/plugins/spec.lua - Module: plugins.kickstart.plugins.spec - - Purpose - Builds the complete lazy.nvim plugin list: requires each per-plugin module, - normalizes return shapes (single spec vs. `{ spec }`), and returns one flat - `LazySpec` array for `lazy.setup()`. - - Rationale - Splitting each plugin into its own file keeps diffs small and matches how - lazy.nvim expects multiple tables to be merged at setup time. - - See `:help lazy.nvim-plugin-spec`, `:help LazySpec`. -]] - ----@param out table ----@param chunk LazySpec|LazySpec[] -local function append_specs(out, chunk) - if type(chunk[1]) == 'string' then - out[#out + 1] = chunk - return - end - for i = 1, #chunk do - out[#out + 1] = chunk[i] - end -end - ----@type LazySpec -local specs = {} -local mods = { - 'plugins.kickstart.plugins.guess_indent', - 'plugins.kickstart.plugins.gitsigns', - 'plugins.kickstart.plugins.which_key', - 'plugins.kickstart.plugins.render_markdown', - 'plugins.kickstart.plugins.telescope', - 'plugins.kickstart.plugins.lsp', - 'plugins.kickstart.plugins.conform', - 'plugins.kickstart.plugins.blink', - 'plugins.kickstart.plugins.tokyonight', - 'plugins.kickstart.plugins.todo_comments', - 'plugins.kickstart.plugins.mini', - 'plugins.kickstart.plugins.treesitter', - 'plugins.kickstart.plugins.vim_helm', - 'plugins.kickstart.plugins.toggleterm', - 'plugins.kickstart.plugins.mini_icons', - 'plugins.kickstart.plugins.debug', - 'plugins.kickstart.plugins.indent_line', - 'plugins.kickstart.plugins.lint', - 'plugins.kickstart.plugins.autopairs', - 'plugins.kickstart.plugins.neo-tree', - 'custom.plugins', -} - -for _, mod in ipairs(mods) do - append_specs(specs, require(mod)) -end - -return specs