X-Git-Url: https://git.xinqibao.xyz/dotfiles.git/blobdiff_plain/19081f95987ce5223b39e6bbdf32c16d5a5e2f62..754f05fab08d7734f656cd7b67a119699ce9e6b9:/.config/nvim/init.vim?ds=inline diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 6971f46..950436a 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -48,7 +48,7 @@ set undodir=~/.cache/nvim/undodir set undofile " auto added comment leader, detail for :h formatoptions -set formatoptions+=/ +set formatoptions+=/ro set tags=tags~;,tags~ "setting gf (go file) path @@ -74,7 +74,6 @@ call plug#begin() Plug 'Yggdroot/indentLine' Plug 'christoomey/vim-tmux-navigator' Plug 'vim-airline/vim-airline' - "Plug 'vim-airline/vim-airline-themes' Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' @@ -90,14 +89,9 @@ call plug#begin() Plug 'airblade/vim-gitgutter' Plug 'kdheepak/lazygit.nvim' - "Plug 'ycm-core/YouCompleteMe' - "Plug 'rhysd/vim-clang-format' - Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'nvim-treesitter/nvim-treesitter' - "Plug 'mfussenegger/nvim-dap' - "Plug 'puremourning/vimspector' """ "" avante and its dependents @@ -175,23 +169,6 @@ if has_key(plugs, 'tagbar') nnoremap t :TagbarToggle endif -"---------------------- -" YouCompleteMe setting -"---------------------- -if has_key(plugs, 'YouCompleteMe') - let g:ycm_global_ycm_extra_conf = '~/.config/nvim/ycm_extra_conf.py' - let g:ycm_confirm_extra_conf = 0 - let g:ycm_enable_diagnostic_signs = 0 - let g:ycm_always_populate_location_list = 1 - "let g:ycm_show_diagnostics_ui = 0 - let g:ycm_add_preview_to_completeopt = 1 - let g:ycm_autoclose_preview_window_after_completion = 1 - let g:ycm_auto_hover = 'no' - - nnoremap gd :YcmCompleter GoTo - nnoremap gr :YcmCompleter GoToReferences -endif - "---------------------- " coc.vim setting "---------------------- @@ -256,7 +233,8 @@ endif if has_key(plugs, 'nvim-treesitter') lua require('plugin-config/nvim-treesitter') - set foldmethod=expr + "set foldmethod=expr + set foldmethod=indent set foldexpr=nvim_treesitter#foldexpr() set foldlevel=99 endif @@ -265,7 +243,7 @@ endif " avante.nvim setting "---------------------- if has_key(plugs, 'avante.nvim') - lua require('plugin-config/nvim-avante') + lua require('plugin-config/avante') endif nnoremap J :tabprevious @@ -287,6 +265,10 @@ nnoremap v- :vertical resize -5 nnoremap fi :set foldmethod=indent nnoremap fd :set foldmethod=manualggVGzD +" 禁用 +nnoremap +xnoremap + "HighLight trailing whitespace" highlight ExtraWhitespace ctermbg=red guibg=red match ExtraWhitespace /\s\+$/