Merge branch 'master' of https://github.com/uvaes/dotfiles

Conflicts:
	vimrc

1 files changed, 35 insertions, 15 deletions

diff --git a/nvimrc b/nvimrc
index 44a70c0..3f7744f 100644
--- a/nvimrc
+++ b/nvimrc
@@ -3,23 +3,29 @@ call plug#begin('~/.nvim/plugged')
 Plug 'airblade/vim-gitgutter', { 'on' : 'GitGutterToggle' }
 Plug 'altercation/vim-colors-solarized'
 Plug 'AndrewRadev/splitjoin.vim'
-Plug 'benekastah/neomake'
+Plug 'benekastah/neomake' , { 'for' : 'cpp' }
 Plug 'bling/vim-airline'
 Plug 'christoomey/vim-tmux-navigator'
 Plug 'edkolev/tmuxline.vim'
 Plug 'freeo/vim-kalisi'
-Plug 'godlygeek/tabular'
+Plug 'godlygeek/tabular' , { 'on' : 'Tab' }
 Plug 'gregsexton/gitv', { 'on' : 'Gitv' }
 Plug 'honza/vim-snippets'
 Plug 'jamessan/vim-gnupg', { 'for' : 'asc' }
+Plug 'junegunn/fzf', { 'on' : 'FZF' }
 Plug 'junegunn/seoul256.vim'
-Plug 'junegunn/fzf' , { 'on' : 'FZF' }
-Plug 'kien/ctrlp.vim'
+Plug 'junegunn/vim-pseudocl'
+Plug 'junegunn/vim-oblique'
+Plug 'junegunn/vim-peekaboo'
+Plug 'junegunn/rainbow_parentheses.vim'
+Plug 'kassio/neoterm', { 'on' : 'T' }
+Plug 'kien/ctrlp.vim', { 'on' : 'CtrlP' }
 Plug 'LaTeX-Box-Team/latex-box', { 'for' : 'tex' }
 Plug 'majutsushi/tagbar'
-Plug 'mileszs/ack.vim'
-Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' }
-Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+Plug 'mileszs/ack.vim', { 'on' : 'Ack' }
+Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' }
+Plug 'ryanss/vim-hackernews', { 'on' : 'HackerNews' }
+Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
 Plug 'scrooloose/syntastic'
 Plug 'SirVer/ultisnips'
 Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' }
@@ -33,16 +39,17 @@ Plug 'tpope/vim-commentary'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-obsession'
 Plug 'tpope/vim-repeat'
-Plug 'tpope/vim-scriptease'
 Plug 'tpope/vim-sensible'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-unimpaired'
 Plug 'troydm/zoomwintab.vim'
 Plug 'Valloric/YouCompleteMe', { 'do' : './install.sh --clang-completer' }
+Plug 'xolox/vim-misc', { 'on' : 'Note' }
+Plug 'xolox/vim-notes', { 'on' : 'Note' }
 call plug#end()
 
 "" Plugins options
-let g:LatexBox_Folding=0
+let g:LatexBox_fold_automatic=0
 let g:LatexBox_latexmk_preview_continuously=1
 let g:LatexBox_quickfix=2
 let g:LatexBox_viewer='zathura'
@@ -84,6 +91,9 @@ let g:ctrlp_prompt_mappings = {
     \ 'PrtHistory(-1)':       ['<c-j>'],
     \ 'PrtHistory(1)':        ['<c-k>'],}
 
+let g:limelight_conceal_ctermfg = 'gray'
+let g:limelight_conceal_ctermfg = 240
+
 let g:syntastic_cpp_compiler = "g++"
 let g:syntastic_cpp_compiler_options = "-std=c++11 -Wall -Wextra -Wpedantic"
 
@@ -105,8 +115,9 @@ let NERDTreeIgnore=['\.pdf$', '\~$','\.toc$',
 
 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_add_preview_to_completeopt = 0
 let g:ycm_confirm_extra_conf = 1
+let g:ycm_auto_trigger = 1
 
 "" Vim options
 
@@ -131,10 +142,11 @@ set undodir=/home/urbain/.nvim/vimundo/
 
 " Layout window
 set nonumber
+set diffopt=filler,vertical
 set listchars=tab:▸\ ,eol:¬,trail:-
 set fillchars=fold:\ ,vert:\ ,
-set showbreak=--▸\ ,
 set breakindent
+let &showbreak='--▸ '
 set colorcolumn=0
 set scrolloff=0
 set t_Co=256
@@ -142,7 +154,7 @@ set guitablabel=%N\ %t\ %M
 set showcmd
 
 " Layout text
-set nowrap
+set wrap
 set linebreak
 set textwidth=0
 set conceallevel=2
@@ -165,10 +177,10 @@ set lazyredraw
 set hidden
 
 " Colorscheme
-try | colorscheme solarized | catch | endtry
+silent! colo solarized
 highlight Comment cterm=italic
 set t_ZH=
-set t_ZR=
+set t_ZR=[23m
 
 "" Maps
 
@@ -192,6 +204,7 @@ nnoremap <Leader>ps :PlugStatus<cr>
 " Toggles
 nnoremap cop :set paste!<cr>
 nnoremap <Leader>tg :GitGutterToggle<cr>
+nnoremap <Leader>tl :Limelight!!<cr>
 nnoremap <Leader>tn :NERDTreeToggle<cr>
 nnoremap <Leader>tt :TagbarToggle<cr>
 nnoremap <Leader>tu :GundoToggle<cr>
@@ -219,6 +232,7 @@ nnoremap <c-y> 3<c-y>
 nnoremap <c-e> 3<c-e>
 nnoremap <Return> o<Esc>
 nnoremap <s-Return> O<Esc>
+nnoremap >f :FZF ~ <cr>
 
 " Git
 nnoremap <Leader>gs :Gstatus<cr>
@@ -246,15 +260,21 @@ vnoremap , :
 
 " Neovim specific
 tnoremap <C-_> <C-\><C-n><C-^>:ZoomWinTabOut<cr>
+tnoremap <C-p> <C-\><C-n>:CtrlPMRUFiles<cr>
 nnoremap <C-_> :ZoomWinTabIn<cr>:b term<cr>i
 inoremap <C-_> <Esc>:b term<cr>i
 
 "" Restore cursor position
-augroup autocommands
+augroup nvimrc
     au!
+    autocmd BufWritePost *vimrc source %
     autocmd BufWritePost *.cpp Neomake!
     autocmd BufReadPost *
                 \ if line("'\"") > 1 && line("'\"") <= line("$") |
                 \   exe "normal! g`\"" |
                 \ endif
 augroup END
+
+"" Experimental
+let g:notes_directories = ['~/dotfiles/notes']
+" Idea: instant download colorscheme