X-Git-Url: https://git.xinqibao.xyz/dotfiles.git/blobdiff_plain/ac28254900b930f3ceb311bca5dfb78c9e222899..a5b430b863e4f060c3d798757b91f94c2d91d35a:/.vimrc?ds=sidebyside

diff --git a/.vimrc b/.vimrc
index 20f122f..32fc510 100644
--- a/.vimrc
+++ b/.vimrc
@@ -5,6 +5,8 @@ set background=dark
 "In order to display chinese in GBK
 let &termencoding=&encoding
 set fileencodings=utf-8,gbk
+set fileformat=unix
+set foldmethod=manual
 
 set t_Co=256 "terminal color
 set t_ut=""
@@ -38,7 +40,7 @@ set undodir=~/.vim/undodir
 set undofile
 
 "ColumnLimit
-set colorcolumn=80
+set colorcolumn=120
 highlight ColorColumn ctermbg=0 guibg=lightgrey
 
 set tags=tags~;,tags~
@@ -51,7 +53,6 @@ set path+=/usr/include,/usr/include/c++/*
 set path+=/usr/local/include
 set path+=~/lib
 
-
 " Writes to the unnamed register also writes to the * and + registers. This
 " makes it easy to interact with the system clipboard
 if has ('unnamedplus')
@@ -67,8 +68,11 @@ Plug 'vim-airline/vim-airline'
 
 Plug 'morhetz/gruvbox'
 Plug 'ycm-core/YouCompleteMe'
-Plug 'kien/ctrlp.vim'
 Plug 'mbbill/undotree'
+"Plug 'kien/ctrlp.vim'
+
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
 
 Plug 'tpope/vim-fugitive'
 Plug 'preservim/nerdtree'
@@ -77,6 +81,7 @@ Plug 'ludovicchabant/vim-gutentags'
 Plug 'plasticboy/vim-markdown'
 Plug 'christoomey/vim-tmux-navigator'
 
+Plug 'Yggdroot/indentLine'
 call plug#end()
 
 colorscheme gruvbox
@@ -96,6 +101,11 @@ autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
 let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
 let g:ctrlp_use_caching = 0
 
+"mapping for fzf.vim
+nnoremap <C-p> :GFiles<CR>
+"as default <C-f>/<C-b> pair used to page down/up entire page
+nnoremap <C-f> :Tags<CR>
+
 let g:ycm_global_ycm_extra_conf = '~/.vim/.ycm_extra_conf.py'
 let g:ycm_confirm_extra_conf = 0
 let g:ycm_enable_diagnostic_signs = 0
@@ -108,6 +118,8 @@ let g:ycm_auto_hover = 'no'
 let mapleader = " "
 nnoremap J :tabprevious<CR>
 nnoremap K :tabnext<CR>
+nnoremap <leader>J :tabmove -1<CR>
+nnoremap <leader>K :tabmove +1<CR>
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k