Migrate to vim.pack

This commit is contained in:
orip 2026-04-20 01:26:12 +03:00
parent 6211a44f5c
commit cd14662c99
11 changed files with 864 additions and 1020 deletions

4
.gitignore vendored
View File

@ -6,9 +6,9 @@ nvim
spell/ spell/
# In your personal fork, you likely want to comment this, since it's recommended to track # In your personal fork, you likely want to comment this, since it's recommended to track
# lazy-lock.json in version control - see https://lazy.folke.io/usage/lockfile # nvim-pack-lock.json in version control - see :help vim.pack-lockfile
# For the official `nvim-lua/kickstart.nvim` git repository, we leave it ignored to avoid unneeded # For the official `nvim-lua/kickstart.nvim` git repository, we leave it ignored to avoid unneeded
# merge conflicts. # merge conflicts.
lazy-lock.json nvim-pack-lock.json
.DS_Store .DS_Store

View File

@ -69,9 +69,9 @@ fork to your machine using one of the commands below, depending on your OS.
> Your fork's URL will be something like this: > Your fork's URL will be something like this:
> `https://github.com/<your_github_username>/kickstart.nvim.git` > `https://github.com/<your_github_username>/kickstart.nvim.git`
You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file You likely want to remove `nvim-pack-lock.json` from your fork's `.gitignore`
too - it's ignored in the kickstart repo to make maintenance easier, but it's file too - it's ignored in the kickstart repo to make maintenance easier, but
[recommended to track it in version control](https://lazy.folke.io/usage/lockfile). it's recommended to track it in version control (see `:help vim.pack-lockfile`).
#### Clone kickstart.nvim #### Clone kickstart.nvim
@ -111,8 +111,9 @@ Start Neovim
nvim nvim
``` ```
That's it! Lazy will install all the plugins you have. Use `:Lazy` to view That's it! `vim.pack` will install all the plugins from your config. Use
the current plugin status. Hit `q` to close the window. `:lua vim.pack.update(nil, { offline = true })` to inspect plugin state and
`:lua vim.pack.update()` to fetch updates.
#### Read The Friendly Documentation #### Read The Friendly Documentation
@ -146,7 +147,8 @@ examples of adding popularly requested plugins.
`~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim `~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
distribution that you would like to try out. distribution that you would like to try out.
* What if I want to "uninstall" this configuration: * What if I want to "uninstall" this configuration:
* See [lazy.nvim uninstall](https://lazy.folke.io/usage#-uninstalling) information * Remove your config directory and local data directory (for example,
`~/.config/nvim` and `~/.local/share/nvim`).
* Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files? * Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
* The main purpose of kickstart is to serve as a teaching tool and a reference * The main purpose of kickstart is to serve as a teaching tool and a reference
configuration that someone can easily use to `git clone` as a basis for their own. configuration that someone can easily use to `git clone` as a basis for their own.

1397
init.lua

File diff suppressed because it is too large Load Diff

View File

@ -3,6 +3,11 @@
-- --
-- See the kickstart.nvim README for more information -- See the kickstart.nvim README for more information
---@module 'lazy' -- Iterate over all Lua files in the plugins directory and load them
---@type LazySpec local plugins_dir = vim.fn.stdpath 'config' .. '/lua/custom/plugins'
return {} for _, file in ipairs(vim.fn.readdir(plugins_dir)) do
if file:match '%.lua$' and file ~= 'init.lua' then
local module = file:gsub('%.lua$', '')
require('custom.plugins.' .. module)
end
end

View File

@ -12,7 +12,7 @@ local check_version = function()
return return
end end
if vim.version.ge(vim.version(), '0.11') then if vim.version.ge(vim.version(), '0.12') then
vim.health.ok(string.format("Neovim version is: '%s'", verstr)) vim.health.ok(string.format("Neovim version is: '%s'", verstr))
else else
vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr)) vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))

View File

@ -1,10 +1,5 @@
-- autopairs -- autopairs
-- https://github.com/windwp/nvim-autopairs -- https://github.com/windwp/nvim-autopairs
---@module 'lazy' vim.pack.add { 'https://github.com/windwp/nvim-autopairs' }
---@type LazySpec require('nvim-autopairs').setup {}
return {
'windwp/nvim-autopairs',
event = 'InsertEnter',
opts = {},
}

View File

@ -6,105 +6,90 @@
-- be extended to other languages as well. That's why it's called -- be extended to other languages as well. That's why it's called
-- kickstart.nvim and not kitchen-sink.nvim ;) -- kickstart.nvim and not kitchen-sink.nvim ;)
---@module 'lazy' vim.pack.add {
---@type LazySpec 'https://github.com/mfussenegger/nvim-dap',
return { 'https://github.com/rcarriga/nvim-dap-ui',
-- NOTE: Yes, you can install new plugins here! 'https://github.com/nvim-neotest/nvim-nio',
'mfussenegger/nvim-dap', 'https://github.com/mason-org/mason.nvim',
-- NOTE: And you can specify dependencies as well 'https://github.com/jay-babu/mason-nvim-dap.nvim',
dependencies = { 'https://github.com/leoluz/nvim-dap-go',
-- Creates a beautiful debugger UI }
'rcarriga/nvim-dap-ui',
-- Basic debugging keymaps, feel free to change to your liking!
-- Required dependency for nvim-dap-ui vim.keymap.set('n', '<F5>', function() require('dap').continue() end, { desc = 'Debug: Start/Continue' })
'nvim-neotest/nvim-nio', vim.keymap.set('n', '<F1>', function() require('dap').step_into() end, { desc = 'Debug: Step Into' })
vim.keymap.set('n', '<F2>', function() require('dap').step_over() end, { desc = 'Debug: Step Over' })
-- Installs the debug adapters for you vim.keymap.set('n', '<F3>', function() require('dap').step_out() end, { desc = 'Debug: Step Out' })
'mason-org/mason.nvim', vim.keymap.set('n', '<leader>b', function() require('dap').toggle_breakpoint() end, { desc = 'Debug: Toggle Breakpoint' })
'jay-babu/mason-nvim-dap.nvim', vim.keymap.set('n', '<leader>B', function() require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ') end, { desc = 'Debug: Set Breakpoint' })
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
-- Add your own debuggers here vim.keymap.set('n', '<F7>', function() require('dapui').toggle() end, { desc = 'Debug: See last session result.' })
'leoluz/nvim-dap-go',
}, local dap = require 'dap'
keys = { local dapui = require 'dapui'
-- Basic debugging keymaps, feel free to change to your liking!
{ '<F5>', function() require('dap').continue() end, desc = 'Debug: Start/Continue' }, require('mason-nvim-dap').setup {
{ '<F1>', function() require('dap').step_into() end, desc = 'Debug: Step Into' }, -- Makes a best effort to setup the various debuggers with
{ '<F2>', function() require('dap').step_over() end, desc = 'Debug: Step Over' }, -- reasonable debug configurations
{ '<F3>', function() require('dap').step_out() end, desc = 'Debug: Step Out' }, automatic_installation = true,
{ '<leader>b', function() require('dap').toggle_breakpoint() end, desc = 'Debug: Toggle Breakpoint' },
{ '<leader>B', function() require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ') end, desc = 'Debug: Set Breakpoint' }, -- You can provide additional configuration to the handlers,
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. -- see mason-nvim-dap README for more information
{ '<F7>', function() require('dapui').toggle() end, desc = 'Debug: See last session result.' }, handlers = {},
},
config = function() -- You'll need to check that you have the required things installed
local dap = require 'dap' -- online, please don't ask me how to install them :)
local dapui = require 'dapui' ensure_installed = {
-- Update this to ensure that you have the debuggers for the langs you want
require('mason-nvim-dap').setup { 'delve',
-- Makes a best effort to setup the various debuggers with },
-- reasonable debug configurations }
automatic_installation = true,
-- Dap UI setup
-- You can provide additional configuration to the handlers, -- For more information, see |:help nvim-dap-ui|
-- see mason-nvim-dap README for more information ---@diagnostic disable-next-line: missing-fields
handlers = {}, dapui.setup {
-- Set icons to characters that are more likely to work in every terminal.
-- You'll need to check that you have the required things installed -- Feel free to remove or use ones that you like more! :)
-- online, please don't ask me how to install them :) -- Don't feel like these are good choices.
ensure_installed = { icons = { expanded = '', collapsed = '', current_frame = '*' },
-- Update this to ensure that you have the debuggers for the langs you want ---@diagnostic disable-next-line: missing-fields
'delve', controls = {
}, icons = {
} pause = '',
play = '',
-- Dap UI setup step_into = '',
-- For more information, see |:help nvim-dap-ui| step_over = '',
---@diagnostic disable-next-line: missing-fields step_out = '',
dapui.setup { step_back = 'b',
-- Set icons to characters that are more likely to work in every terminal. run_last = '▶▶',
-- Feel free to remove or use ones that you like more! :) terminate = '',
-- Don't feel like these are good choices. disconnect = '',
icons = { expanded = '', collapsed = '', current_frame = '*' }, },
---@diagnostic disable-next-line: missing-fields },
controls = { }
icons = {
pause = '', -- Change breakpoint icons
play = '', -- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' })
step_into = '', -- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' })
step_over = '', -- local breakpoint_icons = vim.g.have_nerd_font
step_out = '', -- and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' }
step_back = 'b', -- or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' }
run_last = '▶▶', -- for type, icon in pairs(breakpoint_icons) do
terminate = '', -- local tp = 'Dap' .. type
disconnect = '', -- local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak'
}, -- vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl })
}, -- end
}
dap.listeners.after.event_initialized['dapui_config'] = dapui.open
-- Change breakpoint icons dap.listeners.before.event_terminated['dapui_config'] = dapui.close
-- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' }) dap.listeners.before.event_exited['dapui_config'] = dapui.close
-- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' })
-- local breakpoint_icons = vim.g.have_nerd_font -- Install golang specific config
-- and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' } require('dap-go').setup {
-- or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' } delve = {
-- for type, icon in pairs(breakpoint_icons) do -- On Windows delve must be run attached or it crashes.
-- local tp = 'Dap' .. type -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
-- local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak' detached = vim.fn.has 'win32' == 0,
-- vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl }) },
-- end
dap.listeners.after.event_initialized['dapui_config'] = dapui.open
dap.listeners.before.event_terminated['dapui_config'] = dapui.close
dap.listeners.before.event_exited['dapui_config'] = dapui.close
-- Install golang specific config
require('dap-go').setup {
delve = {
-- On Windows delve must be run attached or it crashes.
-- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
detached = vim.fn.has 'win32' == 0,
},
}
end,
} }

View File

@ -2,62 +2,56 @@
-- NOTE: gitsigns is already included in init.lua but contains only the base -- NOTE: gitsigns is already included in init.lua but contains only the base
-- config. This will add also the recommended keymaps. -- config. This will add also the recommended keymaps.
---@module 'lazy' vim.pack.add { 'https://github.com/lewis6991/gitsigns.nvim' }
---@type LazySpec
return {
'lewis6991/gitsigns.nvim',
---@module 'gitsigns'
---@type Gitsigns.Config
---@diagnostic disable-next-line: missing-fields
opts = {
on_attach = function(bufnr)
local gitsigns = require 'gitsigns'
local function map(mode, l, r, opts) require('gitsigns').setup {
opts = opts or {} on_attach = function(bufnr)
opts.buffer = bufnr local gitsigns = require 'gitsigns'
vim.keymap.set(mode, l, r, opts)
local function map(mode, l, r, opts)
opts = opts or {}
opts.buffer = bufnr
vim.keymap.set(mode, l, r, opts)
end
-- Navigation
map('n', ']c', function()
if vim.wo.diff then
vim.cmd.normal { ']c', bang = true }
else
gitsigns.nav_hunk 'next'
end end
end, { desc = 'Jump to next git [c]hange' })
-- Navigation map('n', '[c', function()
map('n', ']c', function() if vim.wo.diff then
if vim.wo.diff then vim.cmd.normal { '[c', bang = true }
vim.cmd.normal { ']c', bang = true } else
else gitsigns.nav_hunk 'prev'
gitsigns.nav_hunk 'next' end
end end, { desc = 'Jump to previous git [c]hange' })
end, { desc = 'Jump to next git [c]hange' })
map('n', '[c', function() -- Actions
if vim.wo.diff then -- visual mode
vim.cmd.normal { '[c', bang = true } map('v', '<leader>hs', function() gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' })
else map('v', '<leader>hr', function() gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' })
gitsigns.nav_hunk 'prev' -- normal mode
end map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
end, { desc = 'Jump to previous git [c]hange' }) map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
map('n', '<leader>hi', gitsigns.preview_hunk_inline, { desc = 'git preview hunk [i]nline' })
map('n', '<leader>hb', function() gitsigns.blame_line { full = true } end, { desc = 'git [b]lame line' })
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
map('n', '<leader>hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' })
map('n', '<leader>hQ', function() gitsigns.setqflist 'all' end, { desc = 'git hunk [Q]uickfix list (all files in repo)' })
map('n', '<leader>hq', gitsigns.setqflist, { desc = 'git hunk [q]uickfix list (all changes in this file)' })
-- Toggles
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
map('n', '<leader>tw', gitsigns.toggle_word_diff, { desc = '[T]oggle git intra-line [w]ord diff' })
-- Actions -- Text object
-- visual mode map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)
map('v', '<leader>hs', function() gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' }) end,
map('v', '<leader>hr', function() gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' })
-- normal mode
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
map('n', '<leader>hi', gitsigns.preview_hunk_inline, { desc = 'git preview hunk [i]nline' })
map('n', '<leader>hb', function() gitsigns.blame_line { full = true } end, { desc = 'git [b]lame line' })
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
map('n', '<leader>hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' })
map('n', '<leader>hQ', function() gitsigns.setqflist 'all' end, { desc = 'git hunk [Q]uickfix list (all files in repo)' })
map('n', '<leader>hq', gitsigns.setqflist, { desc = 'git hunk [q]uickfix list (all changes in this file)' })
-- Toggles
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
map('n', '<leader>tw', gitsigns.toggle_word_diff, { desc = '[T]oggle git intra-line [w]ord diff' })
-- Text object
map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)
end,
},
} }

View File

@ -1,13 +1,6 @@
-- Add indentation guides even on blank lines -- Add indentation guides even on blank lines
---@module 'lazy' -- Enable `lukas-reineke/indent-blankline.nvim`
---@type LazySpec -- See `:help ibl`
return { vim.pack.add { 'https://github.com/lukas-reineke/indent-blankline.nvim' }
'lukas-reineke/indent-blankline.nvim', require('ibl').setup {}
-- Enable `lukas-reineke/indent-blankline.nvim`
-- See `:help ibl`
main = 'ibl',
---@module 'ibl'
---@type ibl.config
opts = {},
}

View File

@ -1,59 +1,53 @@
-- Linting -- Linting
---@module 'lazy' vim.pack.add { 'https://github.com/mfussenegger/nvim-lint' }
---@type LazySpec
return {
'mfussenegger/nvim-lint',
event = { 'BufReadPre', 'BufNewFile' },
config = function()
local lint = require 'lint'
lint.linters_by_ft = {
markdown = { 'markdownlint' }, -- Make sure to install `markdownlint` via mason / npm
}
-- To allow other plugins to add linters to require('lint').linters_by_ft, local lint = require 'lint'
-- instead set linters_by_ft like this: lint.linters_by_ft = {
-- lint.linters_by_ft = lint.linters_by_ft or {} markdown = { 'markdownlint' }, -- Make sure to install `markdownlint` via mason / npm
-- lint.linters_by_ft['markdown'] = { 'markdownlint' }
--
-- However, note that this will enable a set of default linters,
-- which will cause errors unless these tools are available:
-- {
-- clojure = { "clj-kondo" },
-- dockerfile = { "hadolint" },
-- inko = { "inko" },
-- janet = { "janet" },
-- json = { "jsonlint" },
-- markdown = { "vale" },
-- rst = { "vale" },
-- ruby = { "ruby" },
-- terraform = { "tflint" },
-- text = { "vale" }
-- }
--
-- You can disable the default linters by setting their filetypes to nil:
-- lint.linters_by_ft['clojure'] = nil
-- lint.linters_by_ft['dockerfile'] = nil
-- lint.linters_by_ft['inko'] = nil
-- lint.linters_by_ft['janet'] = nil
-- lint.linters_by_ft['json'] = nil
-- lint.linters_by_ft['markdown'] = nil
-- lint.linters_by_ft['rst'] = nil
-- lint.linters_by_ft['ruby'] = nil
-- lint.linters_by_ft['terraform'] = nil
-- lint.linters_by_ft['text'] = nil
-- Create autocommand which carries out the actual linting
-- on the specified events.
local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
group = lint_augroup,
callback = function()
-- Only run the linter in buffers that you can modify in order to
-- avoid superfluous noise, notably within the handy LSP pop-ups that
-- describe the hovered symbol using Markdown.
if vim.bo.modifiable then lint.try_lint() end
end,
})
end,
} }
-- To allow other plugins to add linters to require('lint').linters_by_ft,
-- instead set linters_by_ft like this:
-- lint.linters_by_ft = lint.linters_by_ft or {}
-- lint.linters_by_ft['markdown'] = { 'markdownlint' }
--
-- However, note that this will enable a set of default linters,
-- which will cause errors unless these tools are available:
-- {
-- clojure = { "clj-kondo" },
-- dockerfile = { "hadolint" },
-- inko = { "inko" },
-- janet = { "janet" },
-- json = { "jsonlint" },
-- markdown = { "vale" },
-- rst = { "vale" },
-- ruby = { "ruby" },
-- terraform = { "tflint" },
-- text = { "vale" }
-- }
--
-- You can disable the default linters by setting their filetypes to nil:
-- lint.linters_by_ft['clojure'] = nil
-- lint.linters_by_ft['dockerfile'] = nil
-- lint.linters_by_ft['inko'] = nil
-- lint.linters_by_ft['janet'] = nil
-- lint.linters_by_ft['json'] = nil
-- lint.linters_by_ft['markdown'] = nil
-- lint.linters_by_ft['rst'] = nil
-- lint.linters_by_ft['ruby'] = nil
-- lint.linters_by_ft['terraform'] = nil
-- lint.linters_by_ft['text'] = nil
-- Create autocommand which carries out the actual linting
-- on the specified events.
local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
group = lint_augroup,
callback = function()
-- Only run the linter in buffers that you can modify in order to
-- avoid superfluous noise, notably within the handy LSP pop-ups that
-- describe the hovered symbol using Markdown.
if vim.bo.modifiable then lint.try_lint() end
end,
})

View File

@ -1,28 +1,25 @@
-- Neo-tree is a Neovim plugin to browse the file system -- Neo-tree is a Neovim plugin to browse the file system
-- https://github.com/nvim-neo-tree/neo-tree.nvim -- https://github.com/nvim-neo-tree/neo-tree.nvim
---@module 'lazy' local plugins = {
---@type LazySpec { src = 'https://github.com/nvim-neo-tree/neo-tree.nvim', version = vim.version.range '*' },
return { 'https://github.com/nvim-lua/plenary.nvim',
'nvim-neo-tree/neo-tree.nvim', 'https://github.com/MunifTanjim/nui.nvim',
version = '*', }
dependencies = {
'nvim-lua/plenary.nvim', if vim.g.have_nerd_font then
'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended table.insert(plugins, 'https://github.com/nvim-tree/nvim-web-devicons') -- not strictly required, but recommended
'MunifTanjim/nui.nvim', end
},
lazy = false, vim.pack.add(plugins)
keys = {
{ '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true }, vim.keymap.set('n', '\\', '<Cmd>Neotree reveal<CR>', { desc = 'NeoTree reveal', silent = true })
},
---@module 'neo-tree' require('neo-tree').setup {
---@type neotree.Config filesystem = {
opts = { window = {
filesystem = { mappings = {
window = { ['\\'] = 'close_window',
mappings = {
['\\'] = 'close_window',
},
}, },
}, },
}, },