From f0f949f8d19520b44f57126bc9f9cd5569e1e815 Mon Sep 17 00:00:00 2001
From: Valentin Brandl <vbrandl@riseup.net>
Date: Thu, 30 Mar 2017 17:00:48 +0200
Subject: [PATCH] Update vimrc and vim plugins

---
 editors/vim/plugins.vim |  2 +-
 editors/vim/vimrc       | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/editors/vim/plugins.vim b/editors/vim/plugins.vim
index 956453a..f87b0d5 100644
--- a/editors/vim/plugins.vim
+++ b/editors/vim/plugins.vim
@@ -22,7 +22,7 @@ Plugin 'Rykka/InstantRst'					" instant preview
 
 Plugin 'cespare/vim-toml'					" toml highlighting
 
-Plugin 'w0rp/ale'							" syntax checking
+" Plugin 'w0rp/ale'							" syntax checking
 Plugin 'ervandew/supertab'
 Plugin 'tpope/vim-commentary'
 Plugin 'tpope/vim-surround'
diff --git a/editors/vim/vimrc b/editors/vim/vimrc
index eb24f61..6a16c77 100644
--- a/editors/vim/vimrc
+++ b/editors/vim/vimrc
@@ -176,10 +176,10 @@ nnoremap <C-e> 3<C-e>
 nnoremap <C-y> 3<C-y>
 
 " moving up and down work as you would expect
-nnoremap <silent> j gj
-nnoremap <silent> k gk
-nnoremap <silent> ^ g^
-nnoremap <silent> $ g$
+nnoremap j gj
+nnoremap k gk
+nnoremap ^ g^
+nnoremap $ g$
 
 " cool resizing
 nnoremap <Left> :vertical resize +2<CR>
@@ -258,6 +258,10 @@ inoremap <special> <expr> <Esc>[200~ XTermPasteBegin()
 
 " ctrlp
 set runtimepath^=~/.vim/bundle/ctrlp.vim
+let g:ctrlp_match_window = 'bottom,order::ttb' " order top to bottom
+let g:ctrlp_switch_buffer = 0 " open files in new buffer
+let g:ctrlp_working_path_mode = 0 " honor working path changes in vim session
+let g:ctrlp_user_command = 'ag %s -l --nocolor --hidden -g ""' " use ag to search for files (faster)
 
 " make true colors in tmux work
 " set t_8f=[38;2;%lu;%lu;%lum
@@ -333,6 +337,8 @@ au FileType rust nmap gs <Plug>(rust-def-split)
 au FileType rust nmap gx <Plug>(rust-def-vertical)
 au FileType rust nmap <leader>gd <Plug>(rust-doc)
 
+let g:rustfmt_autosave = 1 " run rustfmt when saving a file
+
 " close Goyo *and* vim with :q
 function! s:goyo_enter()
   let b:quitting = 0