X-Git-Url: https://git.xinqibao.xyz/dotfiles.git/blobdiff_plain/9a2ac88afb86db3c3ee29f54d6f478983c1caca6..2229f738d010282857424ec9194596690fe338e9:/.config/nvim/init.vim?ds=inline

diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index c7c12e2..9ec564b 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -8,10 +8,10 @@ set t_ut=""
 "set term=xterm-256color
 
 "In order to display chinese in GBK
-let &termencoding=&encoding
+"let &termencoding=&encoding
 set fileencodings=utf-8,gbk
 set fileformat=unix
-set foldmethod=manual
+set foldmethod=indent
 set encoding=utf-8 "required for ycm
 
 set tabstop=4
@@ -79,15 +79,18 @@ call plug#begin()
 
     Plug 'mbbill/undotree'
     Plug 'preservim/nerdtree'
+    Plug 'majutsushi/tagbar'
+
     Plug 'plasticboy/vim-markdown'
 
     Plug 'tpope/vim-fugitive'
+    Plug 'airblade/vim-gitgutter'
     Plug 'kdheepak/lazygit.nvim'
 
     "Plug 'ycm-core/YouCompleteMe'
     "Plug 'rhysd/vim-clang-format'
 
-    Plug 'neoclide/coc.nvim'
+    Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
     Plug 'nvim-treesitter/nvim-treesitter'
     "Plug 'mfussenegger/nvim-dap'
@@ -128,7 +131,7 @@ endif
 " undotree setting
 "----------------------
 if has_key(plugs, 'undotree')
-    nnoremap <leader>u :UndotreeShow<CR>
+    nnoremap <leader>u :UndotreeToggle<CR>
 endif
 
 "----------------------
@@ -141,6 +144,13 @@ if has_key(plugs, 'nerdtree')
     nnoremap <leader>n :NERDTreeToggle<CR>
 endif
 
+"----------------------
+" tagbar setting
+"----------------------
+if has_key(plugs, 'tagbar')
+    nnoremap <leader>t :TagbarToggle<CR>
+endif
+
 "----------------------
 " YouCompleteMe setting
 "----------------------
@@ -205,11 +215,14 @@ if has_key(plugs, "coc.nvim")
                 \'coc-marketplace',
                 \'coc-highlight',
                 \'coc-clangd',
-                \'coc-jedi',
-                \'coc-vimlsp',
+                \'coc-pyright',
+                \'coc-lua',
                 \'coc-sh',
+                \'coc-cmake',
+                \'coc-xmake',
                 \'coc-json',
-                \'coc-yaml'
+                \'coc-yaml',
+                \'coc-vimlsp',
                 \]
 endif
 
@@ -240,6 +253,9 @@ nnoremap <silent> <Leader>- :resize -5<CR>
 nnoremap <silent> <Leader>v+ :vertical resize +5<CR>
 nnoremap <silent> <Leader>v- :vertical resize -5<CR>
 
+" shortcut for folding
+nnoremap <silent> <Leader>fi :set foldmethod=indent<CR>
+nnoremap <silent> <Leader>fd :set foldmethod=manual<CR>ggVGzD
 
 "HighLight trailing whitespace"
 highlight ExtraWhitespace ctermbg=red guibg=red