Skip to content
Browse files

Buncha changes :P

  • Loading branch information...
1 parent 2e0b498 commit f234115e206ab897aedc3a9289730d96e9ab480e Lori Holden committed Jan 25, 2012
Showing with 14 additions and 3 deletions.
  1. +2 −2 bash/dot_prompt
  2. +8 −1 dot_vim/config.vim
  3. +2 −0 dot_vim/keybinds.vim
  4. +2 −0 dot_vim/vundle.vim
View
4 bash/dot_prompt
@@ -24,9 +24,9 @@ function prompt_path {
function prompt_git {
[[ $(type -t __git_ps1) ]] || return
- declare branch="$(__git_ps1)"
+ declare branch="$(__git_ps1 '%s')"
if [[ ! -z "$branch" ]]; then
- echo " [${branch:2:((${#branch} - 3))}]"
+ echo " [$branch]"
fi
}
View
9 dot_vim/config.vim
@@ -50,8 +50,15 @@ highlight Cursor guifg=black guibg=grey
let g:statline_fugitive = 1
" ctrlp
-let g:ctrlp_dotfiles = 1
let g:ctrlp_lazy_update = 100
+let g:ctrlp_match_window_reversed = 0
+let g:ctrlp_max_height = 12
" vimwiki
let g:vimwiki_list = [{'path': $HOME.'/.wiki/', 'path_html': $HOME.'/.wiki_html/'}]
+
+" FuzzyFinder
+let g:fuf_abbrevMap = {
+ \ '^vim:' : [ $VIMHOME ],
+ \ '^home:' : [ $HOME ],
+ \}
View
2 dot_vim/keybinds.vim
@@ -3,6 +3,8 @@ map <Leader>b :FufBuffer<CR>
vmap <Leader>b <ESC>:FufBuffer<CR>
map <Leader>o :FufFile<CR>
vmap <Leader>o <ESC>:FufFile<CR>
+"map <Leader>t :FufCoverageFile<CR>
+"vmap <Leader>t <ESC>:FufCoverageFile<CR>
" CtrlP
map <Leader>t :CtrlP<CR>
View
2 dot_vim/vundle.vim
@@ -24,6 +24,8 @@ Bundle 'tpope/vim-repeat'
Bundle 'tpope/vim-cucumber'
Bundle 'tpope/vim-haml'
Bundle 'tpope/vim-unimpaired'
+Bundle 'tpope/vim-rails'
+Bundle 'tpope/vim-rake'
Bundle 'millermedeiros/vim-statline'
Bundle 'scrooloose/nerdtree'
Bundle 'scrooloose/syntastic.git'

0 comments on commit f234115

Please sign in to comment.
Something went wrong with that request. Please try again.