Use Packer instead of vim-plug
This commit is contained in:
@ -28,6 +28,20 @@ lspkind.init()
|
||||
|
||||
local cmp = require("cmp")
|
||||
|
||||
require'cmp'.setup.cmdline(':', {
|
||||
sources = {
|
||||
{ name = 'cmdline' }
|
||||
}
|
||||
})
|
||||
|
||||
cmp.setup.cmdline('/', {
|
||||
sources = cmp.config.sources({
|
||||
{ name = 'nvim_lsp_document_symbol' }
|
||||
}, {
|
||||
{ name = 'buffer' }
|
||||
})
|
||||
})
|
||||
|
||||
cmp.setup({
|
||||
mapping = {
|
||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||
@ -82,6 +96,7 @@ cmp.setup({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "path" },
|
||||
{ name = "vim_vsnip" },
|
||||
{ name = 'nvim_lsp_signature_help' },
|
||||
{ name = 'nvim_ciderlsp', priority = 9 },
|
||||
{ name = "buffer", keyword_length = 5 },
|
||||
},
|
||||
@ -230,7 +245,7 @@ local on_attach = function(client, bufnr)
|
||||
end
|
||||
|
||||
|
||||
local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
|
||||
capabilities = require('cmp_nvim_ciderlsp').update_capabilities(capabilities)
|
||||
capabilities['codeLens'] = {dynamicRegistration=false}
|
||||
-- capabilities.workspace.codeLens = {refreshSupport=true}
|
||||
|
@ -1,11 +1,155 @@
|
||||
-- Require CiderLSP and Diagnostics modules
|
||||
-- IMPORTANT: Must come after plugins are loaded
|
||||
local fn = vim.fn
|
||||
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
|
||||
if fn.empty(fn.glob(install_path)) > 0 then
|
||||
packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
|
||||
vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. vim.o.runtimepath
|
||||
end
|
||||
|
||||
local packerGroup = vim.api.nvim_create_augroup("packer_auto_compile", { clear = true })
|
||||
vim.api.nvim_create_autocmd("BufWritePost", {
|
||||
pattern = "*/vim/lua/plugins.lua",
|
||||
command = "source <afile> | PackerCompile",
|
||||
group = packerGroup,
|
||||
})
|
||||
|
||||
require('packer').startup(function(use)
|
||||
-- Packer can manage itself
|
||||
use 'wbthomason/packer.nvim'
|
||||
|
||||
use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
|
||||
|
||||
-- Undo tree
|
||||
use {
|
||||
'mbbill/undotree',
|
||||
cmd = 'UndotreeToggle',
|
||||
config = [[vim.g.undotree_SetFocusWhenToggle = 1]],
|
||||
}
|
||||
|
||||
use 'nvim-lua/plenary.nvim'
|
||||
|
||||
-- Pretty symbols
|
||||
use 'kyazdani42/nvim-web-devicons'
|
||||
|
||||
use({"L3MON4D3/LuaSnip", tag = "v<CurrentMajor>.*"})
|
||||
|
||||
-- Completion and linting
|
||||
use 'neovim/nvim-lspconfig'
|
||||
use {
|
||||
'hrsh7th/nvim-cmp',
|
||||
requires = {
|
||||
'onsails/lspkind.nvim',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
'hrsh7th/cmp-buffer',
|
||||
'lukas-reineke/cmp-under-comparator',
|
||||
'hrsh7th/cmp-cmdline',
|
||||
'hrsh7th/cmp-nvim-lsp-document-symbol',
|
||||
'hrsh7th/cmp-nvim-lsp-signature-help',
|
||||
'hrsh7th/cmp-nvim-lua',
|
||||
'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-vsnip',
|
||||
{ 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} },
|
||||
},
|
||||
-- config = [[require('lsp')]],
|
||||
-- event = 'InsertEnter',
|
||||
}
|
||||
use 'folke/trouble.nvim'
|
||||
|
||||
use 'hrsh7th/vim-vsnip'
|
||||
use 'kosayoda/nvim-lightbulb'
|
||||
use {'andymass/vim-matchup', event = 'VimEnter'}
|
||||
use { 'ErichDonGubler/lsp_lines.nvim', config = [[require("lsp_lines").setup()]] }
|
||||
|
||||
use 'jghauser/mkdir.nvim'
|
||||
use 'simrat39/symbols-outline.nvim'
|
||||
use { 'petertriho/nvim-scrollbar', config = [[require("scrollbar").setup()]] }
|
||||
|
||||
use {
|
||||
'nvim-telescope/telescope.nvim' , branch = '0.1.x',
|
||||
requires = { {'nvim-lua/plenary.nvim'} }
|
||||
}
|
||||
|
||||
use {
|
||||
'rmagatti/auto-session',
|
||||
config = function()
|
||||
require("auto-session").setup {
|
||||
log_level = "error",
|
||||
auto_session_suppress_dirs = { "~/", "~/Downloads", "/"},
|
||||
}
|
||||
end
|
||||
}
|
||||
use 'sso://googler@user/vintharas/telescope-codesearch.nvim'
|
||||
use 'nvim-lualine/lualine.nvim'
|
||||
use 'rcarriga/nvim-notify'
|
||||
|
||||
-- Git
|
||||
use {
|
||||
{
|
||||
'lewis6991/gitsigns.nvim',
|
||||
requires = 'nvim-lua/plenary.nvim',
|
||||
config = [[require('config.gitsigns')]],
|
||||
event = 'User ActuallyEditing',
|
||||
},
|
||||
{ 'TimUntersberger/neogit', cmd = 'Neogit', config = [[require('config.neogit')]] },
|
||||
{
|
||||
'akinsho/git-conflict.nvim',
|
||||
tag = '*',
|
||||
config = [[require('git-conflict').setup()]]
|
||||
}
|
||||
}
|
||||
|
||||
use { "catppuccin/nvim", as = "catppuccin"}
|
||||
|
||||
-- mine
|
||||
use {
|
||||
'squk/vim-quantum',
|
||||
'squk/java-syntax.vim'
|
||||
}
|
||||
|
||||
use 'ntpeters/vim-better-whitespace'
|
||||
use 'junegunn/fzf.vim'
|
||||
vim.opt.rtp:append(os.getenv("HOME") .. "/.fzf")
|
||||
|
||||
use 'nathanaelkane/vim-indent-guides'
|
||||
use 'tversteeg/registers.nvim'
|
||||
|
||||
use 'airblade/vim-gitgutter'
|
||||
use 'preservim/vimux'
|
||||
use 'tmux-plugins/vim-tmux'
|
||||
use 'christoomey/vim-tmux-navigator'
|
||||
use 'whatyouhide/vim-tmux-syntax'
|
||||
use 'skywind3000/asyncrun.vim'
|
||||
|
||||
use 'christoomey/vim-titlecase'
|
||||
use 'chiedo/vim-case-convert'
|
||||
|
||||
use 'jremmen/vim-ripgrep'
|
||||
|
||||
use 'preservim/nerdtree'
|
||||
use 'tiagofumo/vim-nerdtree-syntax-highlight'
|
||||
|
||||
use 'udalov/kotlin-vim'
|
||||
|
||||
use 'tmux-plugins/vim-tmux-focus-events'
|
||||
use 'tpope/vim-obsession'
|
||||
use 'Valloric/MatchTagAlways'
|
||||
use 'wesQ3/vim-windowswap'
|
||||
|
||||
use 'tpope/vim-surround'
|
||||
use 'scrooloose/nerdcommenter'
|
||||
use 'mhinz/vim-signify'
|
||||
use { 'j-hui/fidget.nvim', config = [[require("fidget").setup()]] }
|
||||
|
||||
-- Automatically set up your configuration after cloning packer.nvim
|
||||
-- Put this at the end after all plugins
|
||||
if packer_bootstrap then
|
||||
require('packer').sync()
|
||||
end
|
||||
end)
|
||||
|
||||
-- CiderLSP
|
||||
vim.opt.completeopt = { "menu", "menuone", "noselect" }
|
||||
|
||||
require 'lspconfig'
|
||||
|
||||
require('lspconfig')
|
||||
require("lsp")
|
||||
require("diagnostics")
|
||||
require("treesitter")
|
||||
@ -15,11 +159,7 @@ require("notify_config")
|
||||
require("catppuccin-config")
|
||||
require("symbols-outline-config")
|
||||
|
||||
require "fidget".setup{}
|
||||
|
||||
-- redundant w/ lsp_lines
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
virtual_text = false,
|
||||
})
|
||||
require("lsp_lines").setup()
|
||||
require("scrollbar").setup()
|
||||
|
Submodule vim/.vim/plugged/MatchTagAlways deleted from 352eb479a4
Submodule vim/.vim/plugged/asyncrun.vim deleted from eae766d218
Submodule vim/.vim/plugged/c-syntax.vim deleted from e0f36366b8
Submodule vim/.vim/plugged/catppuccin deleted from d5f8176232
Submodule vim/.vim/plugged/cloudformation-syntax.vim deleted from 20a5098e34
Submodule vim/.vim/plugged/cmp-buffer deleted from 3022dbc916
Submodule vim/.vim/plugged/cmp-nvim-lsp deleted from 3cf38d9c95
Submodule vim/.vim/plugged/cmp-nvim-lua deleted from d276254e71
Submodule vim/.vim/plugged/cmp-path deleted from 91ff86cd9c
Submodule vim/.vim/plugged/cmp-vsnip deleted from 1ae05c6c86
Submodule vim/.vim/plugged/ejs-syntax deleted from 0e704c523d
Submodule vim/.vim/plugged/emmet-vim deleted from def5d57a1a
Submodule vim/.vim/plugged/fidget.nvim deleted from 1097a86db8
Submodule vim/.vim/plugged/focuspoint-vim deleted from 72b6634d23
Submodule vim/.vim/plugged/gounit-vim deleted from 69ba1afa31
Submodule vim/.vim/plugged/gv.vim deleted from 1507838ee6
Submodule vim/.vim/plugged/java-syntax.vim deleted from 9a3d76a8c6
Submodule vim/.vim/plugged/kotlin-vim deleted from 1261f851e5
Submodule vim/.vim/plugged/linediff.vim deleted from c627858c6d
Submodule vim/.vim/plugged/lsp_lines.nvim deleted from 3b57922d2d
Submodule vim/.vim/plugged/lspkind.nvim deleted from c68b3a0034
Submodule vim/.vim/plugged/lualine.nvim deleted from edca2b03c7
Submodule vim/.vim/plugged/md-img-paste.vim deleted from 01d747cdde
Submodule vim/.vim/plugged/mkdir.nvim deleted from c55d1dee4f
Submodule vim/.vim/plugged/nerdcommenter deleted from fe74a1b890
Submodule vim/.vim/plugged/nerdtree deleted from fc85a6f07c
Submodule vim/.vim/plugged/nofrils deleted from bad6e49084
Submodule vim/.vim/plugged/nord-vim deleted from 0748955e9e
Submodule vim/.vim/plugged/nvim-cmp deleted from e94d348931
Submodule vim/.vim/plugged/nvim-gdb deleted from 4408d2c106
Submodule vim/.vim/plugged/nvim-lightbulb deleted from 56b9ce31ec
Submodule vim/.vim/plugged/nvim-lspconfig deleted from 2dd9e060f2
Submodule vim/.vim/plugged/nvim-notify deleted from 5e8d494297
Submodule vim/.vim/plugged/nvim-scrollbar deleted from ce0df6954a
Submodule vim/.vim/plugged/nvim-treesitter deleted from 9279bfea5e
Submodule vim/.vim/plugged/nvim-web-devicons deleted from 9061e2d355
Submodule vim/.vim/plugged/omnisharp-vim deleted from 7e88f137ad
Submodule vim/.vim/plugged/onedark.vim deleted from b6b5ffe31a
Submodule vim/.vim/plugged/onehalf deleted from 75eb2e97ac
Submodule vim/.vim/plugged/papercolor-theme deleted from 9051480ad9
Submodule vim/.vim/plugged/php.vim deleted from 930aec5c70
Submodule vim/.vim/plugged/plenary.nvim deleted from 4b7e52044b
Submodule vim/.vim/plugged/purify deleted from 70011ccc32
Submodule vim/.vim/plugged/registers.nvim deleted from a87a7c57dc
Submodule vim/.vim/plugged/shades-of-teal deleted from 5bf84996df
Submodule vim/.vim/plugged/symbols-outline.nvim deleted from 6a3ed24c56
Submodule vim/.vim/plugged/telescope-codesearch.nvim deleted from 9455a5f2a9
Submodule vim/.vim/plugged/telescope.nvim deleted from f174a0367b
Submodule vim/.vim/plugged/tender.vim deleted from 7746453a04
Submodule vim/.vim/plugged/trouble.nvim deleted from ed65f84abc
Submodule vim/.vim/plugged/undotree deleted from bd60cb564e
Submodule vim/.vim/plugged/vim-airline-themes deleted from cc5d3490c8
Submodule vim/.vim/plugged/vim-android deleted from 8911f86284
Submodule vim/.vim/plugged/vim-ansible-yaml deleted from a6f92d17ff
Submodule vim/.vim/plugged/vim-atom-dark deleted from 44feadcbeb
Submodule vim/.vim/plugged/vim-autoflake deleted from 5d0a5b437a
Submodule vim/.vim/plugged/vim-better-whitespace deleted from 1b22dc57a2
Submodule vim/.vim/plugged/vim-case-convert deleted from 0a75eb4cf7
Submodule vim/.vim/plugged/vim-colors-solarized deleted from 528a59f26d
Submodule vim/.vim/plugged/vim-colorscheme-primary deleted from cd6d5422a3
Submodule vim/.vim/plugged/vim-cpp-enhanced-highlight deleted from 4b7314a497
Submodule vim/.vim/plugged/vim-easy-align deleted from 12dd631697
Submodule vim/.vim/plugged/vim-easymotion deleted from b3cfab2a63
Submodule vim/.vim/plugged/vim-exchange deleted from 784d63083a
Submodule vim/.vim/plugged/vim-fugitive deleted from dd8107cabf
Submodule vim/.vim/plugged/vim-git deleted from 5143bea9ed
Submodule vim/.vim/plugged/vim-gitgutter deleted from f19b620319
Submodule vim/.vim/plugged/vim-go deleted from 22b2273cfe
Submodule vim/.vim/plugged/vim-graphql deleted from 4bf5d33bda
Submodule vim/.vim/plugged/vim-helm deleted from c2e7b85711
Submodule vim/.vim/plugged/vim-hybrid-material deleted from ad031275c6
Submodule vim/.vim/plugged/vim-indent-guides deleted from 765084d38b
Submodule vim/.vim/plugged/vim-javascript deleted from c470ce1399
Submodule vim/.vim/plugged/vim-json deleted from 3727f08941
Submodule vim/.vim/plugged/vim-markdown deleted from c3f83ebb43
Submodule vim/.vim/plugged/vim-material-theme deleted from c28195998d
Submodule vim/.vim/plugged/vim-monochrome deleted from c4f18812bb
Submodule vim/.vim/plugged/vim-monokai-tasty deleted from 13a0d38fea
Submodule vim/.vim/plugged/vim-nerdtree-syntax-highlight deleted from 5178ee4d7f
Submodule vim/.vim/plugged/vim-nuuid deleted from 6abc11a794
Submodule vim/.vim/plugged/vim-obsession deleted from 7d39576149
Submodule vim/.vim/plugged/vim-quantum deleted from 1b09222510
Submodule vim/.vim/plugged/vim-scratchpad deleted from d1f7875608
Submodule vim/.vim/plugged/vim-stylus deleted from 0514757a47
Submodule vim/.vim/plugged/vim-surround deleted from bf3480dc9a
Submodule vim/.vim/plugged/vim-syntax-extra deleted from 5906eeab33
Submodule vim/.vim/plugged/vim-table-mode deleted from f47287df37
Submodule vim/.vim/plugged/vim-titlecase deleted from 69a697c54a
Submodule vim/.vim/plugged/vim-tmux deleted from cfe76281ef
Submodule vim/.vim/plugged/vim-tmux-focus-events deleted from b1330e04ff
Submodule vim/.vim/plugged/vim-tmux-navigator deleted from bd4c38be5b
Submodule vim/.vim/plugged/vim-tmux-syntax deleted from 1b6a6a5beb
Submodule vim/.vim/plugged/vim-uncrustify deleted from 9cce24fd70
Submodule vim/.vim/plugged/vim-velocity deleted from a494e9ebbb
Submodule vim/.vim/plugged/vim-vsnip deleted from 7de8a71e5d
Submodule vim/.vim/plugged/vim-windowswap deleted from 15db3f697a
Submodule vim/.vim/plugged/vim-yaml deleted from dce19542d5
Submodule vim/.vim/plugged/vimux deleted from 616fcb4799
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user