diff options
| -rw-r--r-- | vimrc | 59 |
1 files changed, 42 insertions, 17 deletions
@@ -6,26 +6,33 @@ call vundle#rc() "" Plugins Plugin 'gmarik/vundle' -Plugin 'LaTeX-Box-Team/latex-box' -Plugin 'SirVer/ultisnips' Plugin 'airblade/vim-gitgutter' Plugin 'altercation/vim-colors-solarized' +Plugin 'AndrewRadev/splitjoin.vim' Plugin 'bling/vim-airline' Plugin 'christoomey/vim-tmux-navigator' Plugin 'edkolev/tmuxline.vim' +Plugin 'freeo/vim-kalisi' Plugin 'godlygeek/tabular' Plugin 'gregsexton/gitv' Plugin 'honza/vim-snippets' Plugin 'jamessan/vim-gnupg' -Plugin 'terryma/vim-multiple-cursors' -Plugin 'jeetsukumaran/vim-buffergator' -Plugin 'AndrewRadev/splitjoin.vim' +Plugin 'junegunn/seoul256.vim' +Plugin 'junegunn/fzf' Plugin 'kien/ctrlp.vim' +Plugin 'LaTeX-Box-Team/latex-box' Plugin 'majutsushi/tagbar' +Plugin 'mileszs/ack.vim' +Plugin 'rdnetto/YCM-Generator' Plugin 'scrooloose/nerdtree' Plugin 'scrooloose/syntastic' +Plugin 'SirVer/ultisnips' Plugin 'sjl/Gundo.vim' +Plugin 'szw/vim-ctrlspace' +Plugin 'terryma/vim-multiple-cursors' +Plugin 'tomasr/molokai' Plugin 'tommcdo/vim-exchange' +Plugin 'ton/vim-bufsurf' Plugin 'tpope/vim-abolish' Plugin 'tpope/vim-commentary' Plugin 'tpope/vim-fugitive' @@ -35,6 +42,9 @@ Plugin 'tpope/vim-scriptease' Plugin 'tpope/vim-sensible' Plugin 'tpope/vim-surround' Plugin 'tpope/vim-unimpaired' +Plugin 'troydm/zoomwintab.vim' +Plugin 'Valloric/YouCompleteMe' + filetype plugin indent on syntax on @@ -51,7 +61,7 @@ let g:UltiSnipsJumpBackwardTrigger="<s-tab>" let g:UltiSnipsJumpForwardTrigger="<tab>" let g:UltiSnipsListSnippets="<c-l>" let g:UltiSnipsSnippetDirectories=['UltiSnips', 'mySnippets'] -let g:UltiSnipsSnippetsDir="~/.vim/mySnippets" +let g:UltiSnipsSnippetsDir="~/.nvim/mySnippets" let g:airline_left_sep='' let g:airline_right_sep='' @@ -60,9 +70,7 @@ let g:airline_section_y = '' let g:airline_section_z = '%3p%%|%3l|%3c' let g:airline_theme='base16' let g:airline#extensions#tabline#enabled = 0 - -let g:buffergator_display_regime='bufname' -let g:buffergator_vsplit_size=30 +let g:airline_exclude_preview = 0 let g:bufferline_active_buffer_left = '' let g:bufferline_active_buffer_right = '' @@ -70,6 +78,7 @@ let g:bufferline_echo = 0 let g:bufferline_modified = '+' let g:bufferline_rotate = 0 +nnoremap <a-p> :CtrlPMRUFiles<cr> let g:ctrlp_by_filename = 1 let g:ctrlp_cmd = 'CtrlPBuffer' let g:ctrlp_map = '<c-p>' @@ -77,6 +86,11 @@ let g:ctrlp_open_new_file = 't' let g:ctrlp_show_hidden = 1 let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard'] let g:ctrlp_working_path_mode = 'r' +let g:ctrlp_prompt_mappings = { + \ 'PrtSelectMove("j")': ['<c-n>'], + \ 'PrtSelectMove("k")': ['<c-p>'], + \ 'PrtHistory(-1)': ['<c-j>'], + \ 'PrtHistory(1)': ['<c-k>'],} let g:syntastic_cpp_compiler = "g++" let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic" @@ -97,6 +111,11 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$', \ '\.out$', '\.log$','\.aux$','\.sty$', \ '\.fdb_latexmk$', '\.synctex.gz$','\.latexmain$'] +let g:ycm_key_list_select_completion = ['<C-n>', '<Down>'] +let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>'] +let g:ycm_auto_trigger = 1 +let g:ycm_confirm_extra_conf = 1 + "" Vim options " Tabs and indent @@ -108,7 +127,7 @@ set shiftwidth=4 " Folds set foldcolumn=0 -set foldenable +set nofoldenable set foldmethod=expr set foldlevel=0 @@ -116,7 +135,7 @@ set foldlevel=0 set noswapfile set nowritebackup set undofile -set undodir=/home/urbain/.vim/vimundo/ +set undodir=/home/urbain/.nvim/vimundo/ " Layout window set nonumber @@ -144,16 +163,20 @@ set spellfile="/home/urbain/.vim/spell/en.utf-8.add" set smartcase set ignorecase - +" Misc set noautochdir set cpoptions+=Iq set encoding=utf-8 set mouse=a set clipboard=unnamedplus set lazyredraw +set hidden " Colorscheme try | colorscheme solarized | catch | endtry +highlight Comment cterm=italic +set t_ZH=[3m +set t_ZR=[23m "" Maps @@ -175,7 +198,6 @@ nnoremap <Leader>ps :PluginSearch<cr> " Toggles nnoremap cop :set paste!<cr> -nnoremap <Leader>tb :BuffergatorToggle<cr> nnoremap <Leader>tg :GitGutterToggle<cr> nnoremap <Leader>tn :NERDTreeToggle<cr> nnoremap <Leader>tt :TagbarToggle<cr> @@ -187,16 +209,19 @@ nnoremap <Leader>sc :source %<cr> " File edits nnoremap <Leader>es :UltiSnipsEdit<cr> -nnoremap <Leader>em :e ~/.mutt/muttrc<cr> -nnoremap <Leader>ev :e ~/.vimrc<cr> -nnoremap <Leader>ez :e ~/.zshrc<cr> -nnoremap <Leader>et :e ~/.tmux.conf<cr> +nnoremap <Leader>em :e ~/dotfiles/mutt/muttrc<cr> +nnoremap <Leader>en :e ~/dotfiles/nvimrc<cr> +nnoremap <Leader>ev :e ~/dotfiles/vimrc<cr> +nnoremap <Leader>ez :e ~/dotfiles/zshrc<cr> +nnoremap <Leader>et :e ~/dotfiles/tmux.conf<cr> " Formatting nnoremap <Leader>fw :%s/\s\+$//<cr> nnoremap <Leader>fi zzmxgg=G'x " Navigation +nnoremap (( :BufSurfBack<CR> +nnoremap )) :BufSurfForward<CR> nnoremap <c-y> 3<c-y> nnoremap <c-e> 3<c-e> nnoremap <Return> o<Esc> |