|
|
@ -393,7 +393,7 @@ require('lazy').setup({
|
|
|
|
{ 'j-hui/fidget.nvim', opts = {} },
|
|
|
|
{ 'j-hui/fidget.nvim', opts = {} },
|
|
|
|
|
|
|
|
|
|
|
|
-- Allows extra capabilities provided by nvim-cmp
|
|
|
|
-- Allows extra capabilities provided by nvim-cmp
|
|
|
|
-- 'hrsh7th/cmp-nvim-lsp',
|
|
|
|
'hrsh7th/cmp-nvim-lsp',
|
|
|
|
},
|
|
|
|
},
|
|
|
|
config = function()
|
|
|
|
config = function()
|
|
|
|
-- Brief aside: **What is LSP?**
|
|
|
|
-- Brief aside: **What is LSP?**
|
|
|
@ -531,7 +531,7 @@ require('lazy').setup({
|
|
|
|
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
|
|
|
|
-- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
|
|
|
|
-- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
|
|
|
|
-- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
|
|
|
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
|
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
|
|
|
-- capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
|
|
|
|
capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
|
|
|
|
|
|
|
|
|
|
|
|
-- Enable the following language servers
|
|
|
|
-- Enable the following language servers
|
|
|
|
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
|
|
|
|
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
|
|
|
@ -723,7 +723,7 @@ require('lazy').setup({
|
|
|
|
|
|
|
|
|
|
|
|
-- 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(),
|
|
|
|
|
|
|
|
|
|
|
@ -793,43 +793,43 @@ require('lazy').setup({
|
|
|
|
-- Highlight todo, notes, etc in comments
|
|
|
|
-- Highlight todo, notes, etc in comments
|
|
|
|
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
|
|
|
|
{ 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } },
|
|
|
|
|
|
|
|
|
|
|
|
-- { -- Collection of various small independent plugins/modules
|
|
|
|
{ -- Collection of various small independent plugins/modules
|
|
|
|
-- 'echasnovski/mini.nvim',
|
|
|
|
'echasnovski/mini.nvim',
|
|
|
|
-- config = function()
|
|
|
|
config = function()
|
|
|
|
-- -- Better Around/Inside textobjects
|
|
|
|
-- Better Around/Inside textobjects
|
|
|
|
-- --
|
|
|
|
--
|
|
|
|
-- -- Examples:
|
|
|
|
-- Examples:
|
|
|
|
-- -- - va) - [V]isually select [A]round [)]paren
|
|
|
|
-- - va) - [V]isually select [A]round [)]paren
|
|
|
|
-- -- - yinq - [Y]ank [I]nside [N]ext [Q]uote
|
|
|
|
-- - yinq - [Y]ank [I]nside [N]ext [Q]uote
|
|
|
|
-- -- - ci' - [C]hange [I]nside [']quote
|
|
|
|
-- - ci' - [C]hange [I]nside [']quote
|
|
|
|
-- require('mini.ai').setup { n_lines = 500 }
|
|
|
|
require('mini.ai').setup { n_lines = 500 }
|
|
|
|
--
|
|
|
|
|
|
|
|
-- -- Add/delete/replace surroundings (brackets, quotes, etc.)
|
|
|
|
-- Add/delete/replace surroundings (brackets, quotes, etc.)
|
|
|
|
-- --
|
|
|
|
--
|
|
|
|
-- -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
|
|
|
|
-- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren
|
|
|
|
-- -- - sd' - [S]urround [D]elete [']quotes
|
|
|
|
-- - sd' - [S]urround [D]elete [']quotes
|
|
|
|
-- -- - sr)' - [S]urround [R]eplace [)] [']
|
|
|
|
-- - sr)' - [S]urround [R]eplace [)] [']
|
|
|
|
-- require('mini.surround').setup()
|
|
|
|
require('mini.surround').setup()
|
|
|
|
--
|
|
|
|
|
|
|
|
-- -- Simple and easy statusline.
|
|
|
|
-- Simple and easy statusline.
|
|
|
|
-- -- You could remove this setup call if you don't like it,
|
|
|
|
-- You could remove this setup call if you don't like it,
|
|
|
|
-- -- and try some other statusline plugin
|
|
|
|
-- and try some other statusline plugin
|
|
|
|
-- local statusline = require 'mini.statusline'
|
|
|
|
local statusline = require 'mini.statusline'
|
|
|
|
-- -- set use_icons to true if you have a Nerd Font
|
|
|
|
-- set use_icons to true if you have a Nerd Font
|
|
|
|
-- statusline.setup { use_icons = vim.g.have_nerd_font }
|
|
|
|
statusline.setup { use_icons = vim.g.have_nerd_font }
|
|
|
|
--
|
|
|
|
|
|
|
|
-- -- You can configure sections in the statusline by overriding their
|
|
|
|
-- You can configure sections in the statusline by overriding their
|
|
|
|
-- -- default behavior. For example, here we set the section for
|
|
|
|
-- default behavior. For example, here we set the section for
|
|
|
|
-- -- cursor location to LINE:COLUMN
|
|
|
|
-- cursor location to LINE:COLUMN
|
|
|
|
-- ---@diagnostic disable-next-line: duplicate-set-field
|
|
|
|
---@diagnostic disable-next-line: duplicate-set-field
|
|
|
|
-- statusline.section_location = function()
|
|
|
|
statusline.section_location = function()
|
|
|
|
-- return '%2l:%-2v'
|
|
|
|
return '%2l:%-2v'
|
|
|
|
-- end
|
|
|
|
end
|
|
|
|
--
|
|
|
|
|
|
|
|
-- -- ... and there is more!
|
|
|
|
-- ... and there is more!
|
|
|
|
-- -- Check out: https://github.com/echasnovski/mini.nvim
|
|
|
|
-- Check out: https://github.com/echasnovski/mini.nvim
|
|
|
|
-- end,
|
|
|
|
end,
|
|
|
|
-- },
|
|
|
|
},
|
|
|
|
{ -- Highlight, edit, and navigate code
|
|
|
|
{ -- Highlight, edit, and navigate code
|
|
|
|
'nvim-treesitter/nvim-treesitter',
|
|
|
|
'nvim-treesitter/nvim-treesitter',
|
|
|
|
build = ':TSUpdate',
|
|
|
|
build = ':TSUpdate',
|
|
|
@ -869,12 +869,12 @@ require('lazy').setup({
|
|
|
|
-- Here are some example plugins that I've included in the Kickstart repository.
|
|
|
|
-- Here are some example plugins that I've included in the Kickstart repository.
|
|
|
|
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
|
|
|
|
-- Uncomment any of the lines below to enable them (you will need to restart nvim).
|
|
|
|
--
|
|
|
|
--
|
|
|
|
-- require 'kickstart.plugins.debug',
|
|
|
|
require 'kickstart.plugins.debug',
|
|
|
|
-- require 'kickstart.plugins.indent_line',
|
|
|
|
-- require 'kickstart.plugins.indent_line',
|
|
|
|
-- 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.
|
|
|
|