Nvim: update cmp and some plugins

This commit is contained in:
Robert Kmieć
2021-12-22 00:08:22 +01:00
parent e49f84cfac
commit 8f43f9e559
3 changed files with 21 additions and 9 deletions

View File

@@ -34,6 +34,8 @@ cmp.setup({
{ name = 'ultisnips' }, { name = 'ultisnips' },
{ name = 'calc' }, { name = 'calc' },
{ name = 'cmp_git' },
}, { }, {
{ name = 'buffer', keyword_length = 5, max_item_count = 10, priority = -5 }, { name = 'buffer', keyword_length = 5, max_item_count = 10, priority = -5 },
}), }),
@@ -49,11 +51,11 @@ cmp.setup.cmdline('/', {
}) })
cmp.setup.cmdline(':', { cmp.setup.cmdline(':', {
sources = cmp.config.sources({ sources = {
{ name = 'path' }
}, {
{ name = 'cmdline' } { name = 'cmdline' }
}) }
}) })
require("cmp_git").setup()
EOF EOF

View File

@@ -4,6 +4,9 @@ require'nvim-treesitter.configs'.setup {
highlight = { highlight = {
enable = true, enable = true,
}, },
indentation = {
enable = true,
},
ensure_installed = { ensure_installed = {
"bash", "bash",
"c", "c",
@@ -14,4 +17,7 @@ require'nvim-treesitter.configs'.setup {
"rust", "rust",
} }
} }
vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
EOF EOF

View File

@@ -22,14 +22,17 @@ Plug 'derekwyatt/vim-fswitch'
Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
Plug 'vim-test/vim-test' Plug 'vim-test/vim-test'
Plug 'lukas-reineke/indent-blankline.nvim' Plug 'lukas-reineke/indent-blankline.nvim'
Plug 'liuchengxu/vista.vim'
" }}} " }}}
" Completion {{{ " Completion {{{
Plug 'hrsh7th/nvim-cmp'
Plug 'hrsh7th/cmp-nvim-lsp' Plug 'hrsh7th/cmp-nvim-lsp'
Plug 'hrsh7th/cmp-buffer' Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/cmp-path' Plug 'hrsh7th/cmp-path'
Plug 'hrsh7th/cmp-cmdline'
Plug 'hrsh7th/cmp-calc' Plug 'hrsh7th/cmp-calc'
Plug 'hrsh7th/nvim-cmp' Plug 'petertriho/cmp-git'
Plug 'quangnguyen30192/cmp-nvim-ultisnips' Plug 'quangnguyen30192/cmp-nvim-ultisnips'
" }}} " }}}
@@ -40,11 +43,11 @@ Plug 'nvim-lua/popup.nvim'
Plug 'nvim-lua/plenary.nvim' Plug 'nvim-lua/plenary.nvim'
"Plug 'nvim-telescope/telescope.nvim' "Plug 'nvim-telescope/telescope.nvim'
"Plug 'fhill2/telescope-ultisnips.nvim' "Plug 'fhill2/telescope-ultisnips.nvim'
Plug 'liuchengxu/vista.vim'
Plug 'inside/vim-search-pulse' Plug 'inside/vim-search-pulse'
Plug 'wellle/targets.vim' Plug 'wellle/targets.vim'
Plug 'voldikss/vim-floaterm' Plug 'voldikss/vim-floaterm'
Plug 'kevinhwang91/nvim-hlslens' Plug 'kevinhwang91/nvim-hlslens'
Plug 'camspiers/lens.vim'
" }}} " }}}
" Git integration {{{ " Git integration {{{
@@ -65,7 +68,7 @@ Plug 'chrisbra/csv.vim'
" }}} " }}}
" Other plugins (external tools, etc) {{{ " Other plugins (external tools, etc) {{{
Plug 'MortenStabenau/matlab-vim' "Plug 'MortenStabenau/matlab-vim'
Plug 'junegunn/goyo.vim' Plug 'junegunn/goyo.vim'
Plug 'lukas-reineke/virt-column.nvim' Plug 'lukas-reineke/virt-column.nvim'
Plug 'jez/vim-superman' "vman application Plug 'jez/vim-superman' "vman application
@@ -149,7 +152,8 @@ endif
set undodir=~/.cache/nvim/undo/ set undodir=~/.cache/nvim/undo/
set undofile set undofile
let mapleader = "\\" "let mapleader = "\\"
let mapleader = ' '
inoremap jj <ESC> inoremap jj <ESC>
inoremap jk <ESC> inoremap jk <ESC>