Xinqi Bao's Git
projects
/
dotfiles.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
minor update
[dotfiles.git]
/
.config
/
nvim
/
init.vim
diff --git
a/.config/nvim/init.vim
b/.config/nvim/init.vim
index
76502a2
..
9ec564b
100644
(file)
--- 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
"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 fileencodings=utf-8,gbk
set fileformat=unix
-set foldmethod=
manual
+set foldmethod=
indent
set encoding=utf-8 "required for ycm
set tabstop=4
set encoding=utf-8 "required for ycm
set tabstop=4
@@
-90,7
+90,7
@@
call plug#begin()
"Plug 'ycm-core/YouCompleteMe'
"Plug 'rhysd/vim-clang-format'
"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'
Plug 'nvim-treesitter/nvim-treesitter'
"Plug 'mfussenegger/nvim-dap'
@@
-215,11
+215,14
@@
if has_key(plugs, "coc.nvim")
\'coc-marketplace',
\'coc-highlight',
\'coc-clangd',
\'coc-marketplace',
\'coc-highlight',
\'coc-clangd',
- \'coc-
jedi
',
- \'coc-
vimlsp
',
+ \'coc-
pyright
',
+ \'coc-
lua
',
\'coc-sh',
\'coc-sh',
+ \'coc-cmake',
+ \'coc-xmake',
\'coc-json',
\'coc-json',
- \'coc-yaml'
+ \'coc-yaml',
+ \'coc-vimlsp',
\]
endif
\]
endif