|
|
|
@ -642,123 +642,123 @@ require('lazy').setup({
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
{ -- Autocompletion
|
|
|
|
-- { -- Autocompletion
|
|
|
|
'hrsh7th/nvim-cmp',
|
|
|
|
-- 'hrsh7th/nvim-cmp',
|
|
|
|
event = 'InsertEnter',
|
|
|
|
-- event = 'InsertEnter',
|
|
|
|
dependencies = {
|
|
|
|
-- dependencies = {
|
|
|
|
-- Snippet Engine & its associated nvim-cmp source
|
|
|
|
-- -- Snippet Engine & its associated nvim-cmp source
|
|
|
|
{
|
|
|
|
-- {
|
|
|
|
'L3MON4D3/LuaSnip',
|
|
|
|
-- 'L3MON4D3/LuaSnip',
|
|
|
|
build = (function()
|
|
|
|
-- build = (function()
|
|
|
|
-- Build Step is needed for regex support in snippets.
|
|
|
|
-- -- Build Step is needed for regex support in snippets.
|
|
|
|
-- This step is not supported in many windows environments.
|
|
|
|
-- -- This step is not supported in many windows environments.
|
|
|
|
-- Remove the below condition to re-enable on windows.
|
|
|
|
-- -- Remove the below condition to re-enable on windows.
|
|
|
|
if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
|
|
|
|
-- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then
|
|
|
|
return
|
|
|
|
-- return
|
|
|
|
end
|
|
|
|
-- end
|
|
|
|
return 'make install_jsregexp'
|
|
|
|
-- return 'make install_jsregexp'
|
|
|
|
end)(),
|
|
|
|
-- end)(),
|
|
|
|
dependencies = {
|
|
|
|
-- dependencies = {
|
|
|
|
-- `friendly-snippets` contains a variety of premade snippets.
|
|
|
|
-- -- `friendly-snippets` contains a variety of premade snippets.
|
|
|
|
-- See the README about individual language/framework/plugin snippets:
|
|
|
|
-- -- See the README about individual language/framework/plugin snippets:
|
|
|
|
-- https://github.com/rafamadriz/friendly-snippets
|
|
|
|
-- -- https://github.com/rafamadriz/friendly-snippets
|
|
|
|
{
|
|
|
|
-- {
|
|
|
|
'rafamadriz/friendly-snippets',
|
|
|
|
-- 'rafamadriz/friendly-snippets',
|
|
|
|
config = function()
|
|
|
|
-- config = function()
|
|
|
|
require('luasnip.loaders.from_vscode').lazy_load()
|
|
|
|
-- require('luasnip.loaders.from_vscode').lazy_load()
|
|
|
|
end,
|
|
|
|
-- end,
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
'saadparwaiz1/cmp_luasnip',
|
|
|
|
-- 'saadparwaiz1/cmp_luasnip',
|
|
|
|
|
|
|
|
--
|
|
|
|
-- Adds other completion capabilities.
|
|
|
|
-- -- Adds other completion capabilities.
|
|
|
|
-- nvim-cmp does not ship with all sources by default. They are split
|
|
|
|
-- -- nvim-cmp does not ship with all sources by default. They are split
|
|
|
|
-- into multiple repos for maintenance purposes.
|
|
|
|
-- -- into multiple repos for maintenance purposes.
|
|
|
|
'hrsh7th/cmp-nvim-lsp',
|
|
|
|
-- 'hrsh7th/cmp-nvim-lsp',
|
|
|
|
'hrsh7th/cmp-path',
|
|
|
|
-- 'hrsh7th/cmp-path',
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
config = function()
|
|
|
|
-- config = function()
|
|
|
|
-- See `:help cmp`
|
|
|
|
-- -- See `:help cmp`
|
|
|
|
local cmp = require 'cmp'
|
|
|
|
-- local cmp = require 'cmp'
|
|
|
|
local luasnip = require 'luasnip'
|
|
|
|
-- local luasnip = require 'luasnip'
|
|
|
|
luasnip.config.setup {}
|
|
|
|
-- luasnip.config.setup {}
|
|
|
|
|
|
|
|
--
|
|
|
|
cmp.setup {
|
|
|
|
-- cmp.setup {
|
|
|
|
snippet = {
|
|
|
|
-- snippet = {
|
|
|
|
expand = function(args)
|
|
|
|
-- expand = function(args)
|
|
|
|
luasnip.lsp_expand(args.body)
|
|
|
|
-- luasnip.lsp_expand(args.body)
|
|
|
|
end,
|
|
|
|
-- end,
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
completion = { completeopt = 'menu,menuone,noinsert' },
|
|
|
|
-- completion = { completeopt = 'menu,menuone,noinsert' },
|
|
|
|
|
|
|
|
--
|
|
|
|
-- For an understanding of why these mappings were
|
|
|
|
-- -- For an understanding of why these mappings were
|
|
|
|
-- chosen, you will need to read `:help ins-completion`
|
|
|
|
-- -- chosen, you will need to read `:help ins-completion`
|
|
|
|
--
|
|
|
|
-- --
|
|
|
|
-- No, but seriously. Please read `:help ins-completion`, it is really good!
|
|
|
|
-- -- No, but seriously. Please read `:help ins-completion`, it is really good!
|
|
|
|
mapping = cmp.mapping.preset.insert {
|
|
|
|
-- mapping = cmp.mapping.preset.insert {
|
|
|
|
-- Select the [n]ext item
|
|
|
|
-- -- Select the [n]ext item
|
|
|
|
['<C-n>'] = cmp.mapping.select_next_item(),
|
|
|
|
-- ['<C-n>'] = cmp.mapping.select_next_item(),
|
|
|
|
-- Select the [p]revious item
|
|
|
|
-- -- Select the [p]revious item
|
|
|
|
['<C-p>'] = cmp.mapping.select_prev_item(),
|
|
|
|
-- ['<C-p>'] = cmp.mapping.select_prev_item(),
|
|
|
|
|
|
|
|
--
|
|
|
|
-- Scroll the documentation window [b]ack / [f]orward
|
|
|
|
-- -- Scroll the documentation window [b]ack / [f]orward
|
|
|
|
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
|
|
|
-- ['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
|
|
|
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
|
|
|
-- ['<C-f>'] = cmp.mapping.scroll_docs(4),
|
|
|
|
|
|
|
|
--
|
|
|
|
-- Accept ([y]es) the completion.
|
|
|
|
-- -- Accept ([y]es) the completion.
|
|
|
|
-- This will auto-import if your LSP supports it.
|
|
|
|
-- -- This will auto-import if your LSP supports it.
|
|
|
|
-- This will expand snippets if the LSP sent a snippet.
|
|
|
|
-- -- This will expand snippets if the LSP sent a snippet.
|
|
|
|
['<C-y>'] = cmp.mapping.confirm { select = true },
|
|
|
|
-- ['<C-y>'] = cmp.mapping.confirm { select = true },
|
|
|
|
|
|
|
|
--
|
|
|
|
-- If you prefer more traditional completion keymaps,
|
|
|
|
-- -- If you prefer more traditional completion keymaps,
|
|
|
|
-- you can uncomment the following lines
|
|
|
|
-- -- you can uncomment the following lines
|
|
|
|
--['<CR>'] = cmp.mapping.confirm { select = true },
|
|
|
|
-- --['<CR>'] = cmp.mapping.confirm { select = true },
|
|
|
|
--['<Tab>'] = cmp.mapping.select_next_item(),
|
|
|
|
-- --['<Tab>'] = cmp.mapping.select_next_item(),
|
|
|
|
--['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
|
|
|
-- --['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
|
|
|
|
|
|
|
--
|
|
|
|
-- Manually trigger a completion from nvim-cmp.
|
|
|
|
-- -- Manually trigger a completion from nvim-cmp.
|
|
|
|
-- Generally you don't need this, because nvim-cmp will display
|
|
|
|
-- -- Generally you don't need this, because nvim-cmp will display
|
|
|
|
-- completions whenever it has completion options available.
|
|
|
|
-- -- completions whenever it has completion options available.
|
|
|
|
['<C-Space>'] = cmp.mapping.complete {},
|
|
|
|
-- ['<C-Space>'] = cmp.mapping.complete {},
|
|
|
|
|
|
|
|
--
|
|
|
|
-- Think of <c-l> as moving to the right of your snippet expansion.
|
|
|
|
-- -- Think of <c-l> as moving to the right of your snippet expansion.
|
|
|
|
-- So if you have a snippet that's like:
|
|
|
|
-- -- So if you have a snippet that's like:
|
|
|
|
-- function $name($args)
|
|
|
|
-- -- function $name($args)
|
|
|
|
-- $body
|
|
|
|
-- -- $body
|
|
|
|
-- end
|
|
|
|
-- -- end
|
|
|
|
--
|
|
|
|
-- --
|
|
|
|
-- <c-l> will move you to the right of each of the expansion locations.
|
|
|
|
-- -- <c-l> will move you to the right of each of the expansion locations.
|
|
|
|
-- <c-h> is similar, except moving you backwards.
|
|
|
|
-- -- <c-h> is similar, except moving you backwards.
|
|
|
|
['<C-l>'] = cmp.mapping(function()
|
|
|
|
-- ['<C-l>'] = cmp.mapping(function()
|
|
|
|
if luasnip.expand_or_locally_jumpable() then
|
|
|
|
-- if luasnip.expand_or_locally_jumpable() then
|
|
|
|
luasnip.expand_or_jump()
|
|
|
|
-- luasnip.expand_or_jump()
|
|
|
|
end
|
|
|
|
-- end
|
|
|
|
end, { 'i', 's' }),
|
|
|
|
-- end, { 'i', 's' }),
|
|
|
|
['<C-h>'] = cmp.mapping(function()
|
|
|
|
-- ['<C-h>'] = cmp.mapping(function()
|
|
|
|
if luasnip.locally_jumpable(-1) then
|
|
|
|
-- if luasnip.locally_jumpable(-1) then
|
|
|
|
luasnip.jump(-1)
|
|
|
|
-- luasnip.jump(-1)
|
|
|
|
end
|
|
|
|
-- end
|
|
|
|
end, { 'i', 's' }),
|
|
|
|
-- end, { 'i', 's' }),
|
|
|
|
|
|
|
|
--
|
|
|
|
-- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
|
|
|
|
-- -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
|
|
|
|
-- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
|
|
|
|
-- -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
sources = {
|
|
|
|
-- sources = {
|
|
|
|
{
|
|
|
|
-- {
|
|
|
|
name = 'lazydev',
|
|
|
|
-- name = 'lazydev',
|
|
|
|
-- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
|
|
|
|
-- -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it
|
|
|
|
group_index = 0,
|
|
|
|
-- group_index = 0,
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
{ name = 'nvim_lsp' },
|
|
|
|
-- { name = 'nvim_lsp' },
|
|
|
|
{ name = 'luasnip' },
|
|
|
|
-- { name = 'luasnip' },
|
|
|
|
{ name = 'path' },
|
|
|
|
-- { name = 'path' },
|
|
|
|
{ name = 'copilot' },
|
|
|
|
-- { name = 'copilot' },
|
|
|
|
{ name = 'buffer' },
|
|
|
|
-- { name = 'buffer' },
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
}
|
|
|
|
-- }
|
|
|
|
end,
|
|
|
|
-- end,
|
|
|
|
},
|
|
|
|
-- },
|
|
|
|
|
|
|
|
|
|
|
|
{ -- You can easily change to a different colorscheme.
|
|
|
|
{ -- You can easily change to a different colorscheme.
|
|
|
|
-- Change the name of the colorscheme plugin below, and then
|
|
|
|
-- Change the name of the colorscheme plugin below, and then
|
|
|
|
@ -830,7 +830,7 @@ require('lazy').setup({
|
|
|
|
{ 'nushell/tree-sitter-nu' },
|
|
|
|
{ 'nushell/tree-sitter-nu' },
|
|
|
|
},
|
|
|
|
},
|
|
|
|
opts = {
|
|
|
|
opts = {
|
|
|
|
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'nu' },
|
|
|
|
ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc', 'nu', 'go' },
|
|
|
|
-- Autoinstall languages that are not installed
|
|
|
|
-- Autoinstall languages that are not installed
|
|
|
|
auto_install = true,
|
|
|
|
auto_install = true,
|
|
|
|
highlight = {
|
|
|
|
highlight = {
|
|
|
|
@ -864,13 +864,13 @@ require('lazy').setup({
|
|
|
|
-- require 'kickstart.plugins.lint',
|
|
|
|
-- require 'kickstart.plugins.lint',
|
|
|
|
-- require 'kickstart.plugins.autopairs',
|
|
|
|
-- require 'kickstart.plugins.autopairs',
|
|
|
|
-- require 'kickstart.plugins.neo-tree',
|
|
|
|
-- require 'kickstart.plugins.neo-tree',
|
|
|
|
require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
|
|
|
|
-- require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps
|
|
|
|
|
|
|
|
|
|
|
|
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
|
|
|
|
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
|
|
|
|
-- This is the easiest way to modularize your config.
|
|
|
|
-- This is the easiest way to modularize your config.
|
|
|
|
--
|
|
|
|
--
|
|
|
|
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
|
|
|
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
|
|
|
|
{ import = 'custom.plugins' },
|
|
|
|
-- { import = 'custom.plugins' },
|
|
|
|
--
|
|
|
|
--
|
|
|
|
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
|
|
|
|
-- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec`
|
|
|
|
-- Or use telescope!
|
|
|
|
-- Or use telescope!
|
|
|
|
|
Joshua Nussbaum
4 months ago