|  | @@ -5,7 +5,7 @@ Plug 'tpope/vim-sleuth'
 | 
											
												
													
														|  |  Plug 'tpope/vim-fugitive'
 |  |  Plug 'tpope/vim-fugitive'
 | 
											
												
													
														|  |  Plug 'bling/vim-airline'
 |  |  Plug 'bling/vim-airline'
 | 
											
												
													
														|  |  Plug 'mhinz/vim-signify'
 |  |  Plug 'mhinz/vim-signify'
 | 
											
												
													
														|  | -Plug 'Shougo/unite.vim'
 |  | 
 | 
											
												
													
														|  | 
 |  | +Plug 'ctrlpvim/ctrlp.vim'
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  if executable('lein')
 |  |  if executable('lein')
 | 
											
												
													
														|  |    Plug 'guns/vim-sexp'
 |  |    Plug 'guns/vim-sexp'
 | 
											
										
											
												
													
														|  | @@ -20,21 +20,12 @@ call plug#end()
 | 
											
												
													
														|  |  " ----- plugin settings ------
 |  |  " ----- plugin settings ------
 | 
											
												
													
														|  |  let g:signify_vcs_list = [ 'git' ]
 |  |  let g:signify_vcs_list = [ 'git' ]
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -call unite#filters#matcher_default#use(['matcher_fuzzy'])
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -" use ag if present
 |  | 
 | 
											
												
													
														|  |  if executable('ag')
 |  |  if executable('ag')
 | 
											
												
													
														|  | -  " we run a wrapper around ag so it respects agignore
 |  | 
 | 
											
												
													
														|  | -  let g:unite_source_rec_async_command = ['sh', expand('~/.vim/ag-unite')]
 |  | 
 | 
											
												
													
														|  | 
 |  | +  " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
 | 
											
												
													
														|  | 
 |  | +  " we cd first into the dir so ag will use .agignore correctly
 | 
											
												
													
														|  | 
 |  | +  let g:ctrlp_user_command = 'cd %s && ag --nocolor --hidden -g ""'
 | 
											
												
													
														|  |  endif
 |  |  endif
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -autocmd FileType unite call s:unite_settings()
 |  | 
 | 
											
												
													
														|  | -function! s:unite_settings()
 |  | 
 | 
											
												
													
														|  | -  " Enable navigation with control-j and control-k in insert mode
 |  | 
 | 
											
												
													
														|  | -  imap <buffer> <C-j>   <Plug>(unite_select_next_line)
 |  | 
 | 
											
												
													
														|  | -  imap <buffer> <C-k>   <Plug>(unite_select_previous_line)
 |  | 
 | 
											
												
													
														|  | -endfunction
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  |  " ------ settings ------
 |  |  " ------ settings ------
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  " xdg-ish settings
 |  |  " xdg-ish settings
 | 
											
										
											
												
													
														|  | @@ -90,15 +81,13 @@ nnoremap k gk
 | 
											
												
													
														|  |  vnoremap j gj
 |  |  vnoremap j gj
 | 
											
												
													
														|  |  vnoremap k gk
 |  |  vnoremap k gk
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -" opening unite
 |  | 
 | 
											
												
													
														|  | -nnoremap <C-P> :Unite -no-split -buffer-name=files -start-insert file_rec<cr>
 |  | 
 | 
											
												
													
														|  | -nnoremap <C-O> :Unite -no-split -buffer-name=buffers -start-insert buffer<cr>
 |  | 
 | 
											
												
													
														|  | 
 |  | +" opening ctrlp
 | 
											
												
													
														|  | 
 |  | +nnoremap <C-O> :CtrlPBuffer<cr>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  " ------ nvim specific ------
 |  |  " ------ nvim specific ------
 | 
											
												
													
														|  |  if has('nvim')
 |  |  if has('nvim')
 | 
											
												
													
														|  |    tnoremap jj <C-\><C-N>
 |  |    tnoremap jj <C-\><C-N>
 | 
											
												
													
														|  |    tnoremap <C-W> <C-\><C-N><C-W>
 |  |    tnoremap <C-W> <C-\><C-N><C-W>
 | 
											
												
													
														|  | -  nnoremap <C-P> :Unite -no-split -buffer-name=files -start-insert file_rec/neovim<cr>
 |  | 
 | 
											
												
													
														|  |  endif
 |  |  endif
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  augroup formatting
 |  |  augroup formatting
 |