dotfiles

commit bd0d5b5647d9ed4a1b6c3248337e793932a70dc6
parent 5b08015627e2ba1730b64286b36104bad85cf729
Author: edvb54 <edvb54@gmail.com>
Date:   Wed, 18 Jun 2014 12:35:50 -0700

Add a BASH and VIM plug-in, FZF

Diffstat:
bash_profile
 | 
2
--
bashrc
 | 
7
+++++--
vim/bundle/fzf
 | 
1
+
vimrc
 | 
13
++++++++-----
vimrc.bundles
 | 
2
++

5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/bash_profile b/bash_profile
@@ -55,8 +55,6 @@ export EDITOR='vim'
 
 # fortune | cowsay
 
-. ~/dotfiles/git-prompt.sh
-
 # alias stuff{{{1
 bind '"\t":menu-complete'
 alias sb='source ~/.bashrc'
diff --git a/bashrc b/bashrc
@@ -110,5 +110,8 @@ if ! shopt -oq posix; then
 fi
 #}}}
 # load bash_profile
-. ~/dotfiles/colors
-. ~/dotfiles/bash_profile
+source ~/dotfiles/bash_profile
+source ~/dotfiles/colors
+source ~/.fzf.bash
+source ~/dotfiles/git-prompt.sh
+
diff --git a/vim/bundle/fzf b/vim/bundle/fzf
@@ -0,0 +1 @@
+Subproject commit de0965619716d7222ee0ff17cf8ef1a37f2fd861
diff --git a/vimrc b/vimrc
@@ -128,11 +128,14 @@ let g:multi_cursor_prev_key='<C-h>'
 
 " tmux-navigator plug-in mappings
 let g:tmux_navigator_no_mappings = 1
-nnoremap <silent> <M-h> :TmuxNavigateLeft<cr>
-nnoremap <silent> <M-j> :TmuxNavigateDown<cr>
-nnoremap <silent> <M-k> :TmuxNavigateUp<cr>
-nnoremap <silent> <M-l> :TmuxNavigateRight<cr>
-nnoremap <silent> <M-\> :TmuxNavigatePrevious<cr>
+nnoremap <silent> <M-h> :TmuxNavigateLeft<CR>
+nnoremap <silent> <M-j> :TmuxNavigateDown<CR>
+nnoremap <silent> <M-k> :TmuxNavigateUp<CR>
+nnoremap <silent> <M-l> :TmuxNavigateRight<CR>
+nnoremap <silent> <M-\> :TmuxNavigatePrevious<CR>
+
+" mapping for FZF plug-in
+nnoremap <silent> <C-I> :FZF!<CR>
 
 "}}}
 " rainbow parentheses stuff{{{2
diff --git a/vimrc.bundles b/vimrc.bundles
@@ -53,6 +53,8 @@ Bundle 'bling/vim-airline'
 Bundle 'mhinz/vim-startify'
 " use same keys for moving around TMUX and Vim splits
 Bundle 'christoomey/vim-tmux-navigator'
+" fuzzy finder for Vim and Bash
+Bundle 'junegunn/fzf'
 
 """ auto complete plug-ins
 " implement snippets