From cd9c5d54af09f2b02de2dacc873e985f70049b68 Mon Sep 17 00:00:00 2001
From: Valentin Gehrke <madmaurice@zom.bi>
Date: Sat, 21 Nov 2015 19:10:50 +0100
Subject: [PATCH] more vimrc stuff

---
 vim/.vimrc | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/vim/.vimrc b/vim/.vimrc
index c59bfe6..ec6b0d0 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -28,6 +28,7 @@ Plugin 'vim-scripts/L9' "dependency for FuzzyFinder
 Plugin 'vim-scripts/FuzzyFinder' "Fuzzy finding
 Plugin 'cohama/lexima.vim' "Auto pairs
 Plugin 'tpope/vim-surround' "Vim surround
+Plugin 'vim-scripts/rfc-syntax' " RFC Syntax highlight
 " }}}
 
 " --- End init vundle {{{
@@ -173,13 +174,13 @@ nnoremap <silent> <leader>t :g/TODO/<cr>
 " 0 should find first non blank
 nmap 0 ^
 " Easy buffer switching
-nnoremap <silent> M :bnext<cr>
-nnoremap <silent> N :bprev<cr>
+nnoremap <silent> H :bnext<cr>
+nnoremap <silent> L :bprev<cr>
 " Moving through windows
-nnoremap <C-l> <C-w>l
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
+nnoremap <silent> <C-l> <C-w>l
+nnoremap <silent> <C-h> <C-w>h
+nnoremap <silent> <C-j> <C-w>j
+nnoremap <silent> <C-k> <C-w>k
 nnoremap K :q<cr>
 " Quick macroing
 nnoremap Q @@
@@ -196,16 +197,11 @@ vnoremap < <gv
 " Automatic running
 autocmd filetype python nnoremap <F5> :w<cr>:!python %<cr>
 
-" Easy changing
-nnoremap " f"ci"
-nnoremap ( f)ci(
-nnoremap ' f'ci'
-
 " Sudo to write
 cnoremap w!! w !sudo tee % >/dev/null
 
 " --- Just a nuisance
-nnoremap q: <nop>
+map q: <nop>
 
 " --- No moving in insert mode allowed
 ino <down> <Nop>
@@ -252,10 +248,11 @@ let NERDTreeQuitOnOpen = 1
 " }}}
 
 " --- EasyMotion config {{{
+let g:EasyMotion_do_mapping = 0 " Disable default mappings
+
 map / <Plug>(easymotion-sn)
 omap / <Plug>(easymotion-tn)
 map ? <Plug>(easymotion-bd-jk)
-
 map n <Plug>(easymotion-next)
 map N <Plug>(easymotion-prev)
 " }}}