From c1312da35ab74bf06139b5823b063177e6098c5f Mon Sep 17 00:00:00 2001
From: Valentin Gehrke <madmaurice@zom.bi>
Date: Mon, 2 Nov 2015 22:12:53 +0100
Subject: [PATCH] Added FuzzyFinder + different buffer switching keys + only
 close nerdtree if last buffer + Supertab hi moved to theme file

---
 vim/.vim/colors/madtheme.vim |  5 +++++
 vim/.vimrc                   | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/vim/.vim/colors/madtheme.vim b/vim/.vim/colors/madtheme.vim
index d8a45b7..c1a6b8b 100644
--- a/vim/.vim/colors/madtheme.vim
+++ b/vim/.vim/colors/madtheme.vim
@@ -76,4 +76,9 @@ hi TabLine cterm=none ctermfg=white ctermbg=none
 hi TabLineSel cterm=none ctermfg=lightblue ctermbg=none
 hi TabLineFill cterm=none ctermfg=none ctermbg=none
 
+" Supertab
+hi Pmenu ctermfg=white ctermbg=black
+hi PmenuSel ctermfg=blue ctermbg=black
+hi PmenuSbar ctermfg=white ctermbg=black cterm=none
+
 "vim: sw=4
diff --git a/vim/.vimrc b/vim/.vimrc
index 646d775..b03b4f5 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -23,6 +23,8 @@ Plugin 'benmills/vimux' "Tmux integration
 Plugin 'vim-scripts/argtextobj.vim' "function argument textobj
 Plugin 'rstacruz/sparkup' "quick html writing
 Plugin 'ap/vim-buftabline' "Buffer as tabline
+Plugin 'vim-scripts/L9' "dependency for FuzzyFinder
+Plugin 'vim-scripts/FuzzyFinder' "Fuzzy finding
 
 " --- End init vundle
 call vundle#end()
@@ -122,6 +124,8 @@ nnoremap <silent> <leader>q         :bd<cr>
 nnoremap <silent> <leader>w         :w<cr>
 " Insert empty line before and after
 nnoremap <silent> <C-o>             o<ESC>kO
+" Fuzzy Finder
+nnoremap <silent> <leader>f :FufFile<cr>
 " Goto next emptyline
 nnoremap <silent> <space>           /^$<cr>
 " nnoremap <silent> <>         ?^$<cr>
@@ -145,8 +149,8 @@ nnoremap <silent> <leader>todo :g/TODO/<cr>
 " 0 should find first non blank
 nmap 0 ^
 " Easy buffer switching
-nnoremap <silent> <leader>b :MBEFocus<cr>
-nnoremap <silent> <Tab> :bnext<cr>
+nnoremap <silent> <leader>m :bnext<cr>
+nnoremap <silent> <leader>n :bprev<cr>
 " Moving through windows
 nnoremap <C-l> <C-w>l
 nnoremap <C-h> <C-w>h
@@ -154,7 +158,7 @@ nnoremap <C-j> <C-w>j
 nnoremap <C-k> <C-w>k
 
 " Quick macroing
-:nnoremap + @wj
+nnoremap + @wj
 
 " --- Don't need a help
 inoremap <F1> <nop>
@@ -185,18 +189,14 @@ set statusline+=\ L%l
 set statusline+=\ C%c
 hi Modified ctermfg=red
 hi StatusLine cterm=None ctermfg=green ctermbg=none
-hi Search cterm=NONE
+hi Search cterm=NONE ctermfg=none ctermbg=none
 hi IncSearch cterm=underline ctermbg=none ctermfg=green
-hi VertSplit cterm=none ctermbg=none ctermfg=blue
 
 " --- Supertab
-hi Pmenu ctermfg=green ctermbg=black
-hi PmenuSel ctermfg=white ctermbg=black
-hi PmenuSbar ctermfg=white ctermbg=black cterm=none
 let g:SuperTabNoCompleteAfter = ['^',',','\s']
 
 " --- NERDTree tabs
-autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+autocmd bufenter * if (winnr("$") == 1 && bufnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
 nmap <silent> <leader>e :NERDTreeToggle<CR>
 autocmd StdinReadPre * let s:std_in=1
 autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif