diff --git a/vim/clipboard.vim b/vim/clipboard.vim index ae5a7ec..e8c60b4 100644 --- a/vim/clipboard.vim +++ b/vim/clipboard.vim @@ -1,3 +1,3 @@ -Bundle 'sickill/vim-pasta' +Plugin 'sickill/vim-pasta' set clipboard=unnamed diff --git a/vim/colors.vim b/vim/colors.vim index 55cba15..70ac858 100644 --- a/vim/colors.vim +++ b/vim/colors.vim @@ -1,4 +1,4 @@ -Bundle 'altercation/vim-colors-solarized' +Plugin 'altercation/vim-colors-solarized' set t_Co=256 colorscheme solarized diff --git a/vim/git.vim b/vim/git.vim index 574cff6..c6155e6 100644 --- a/vim/git.vim +++ b/vim/git.vim @@ -1,2 +1,2 @@ -Bundle 'tpope/vim-fugitive' -Bundle 'mattn/gist-vim' +Plugin 'tpope/vim-fugitive' +Plugin 'mattn/gist-vim' diff --git a/vim/rails.vim b/vim/rails.vim index c3cf499..d176858 100644 --- a/vim/rails.vim +++ b/vim/rails.vim @@ -1,4 +1,4 @@ -Bundle 'tpope/vim-rails' +Plugin 'tpope/vim-rails' let g:rails_projections = { \ "app/constraints/*_constraint.rb": { diff --git a/vim/ruby.vim b/vim/ruby.vim index 1feca38..251bf04 100644 --- a/vim/ruby.vim +++ b/vim/ruby.vim @@ -1,5 +1,5 @@ -Bundle 'tpope/vim-bundler' -Bundle 'tpope/vim-rake' -Bundle 'tpope/vim-surround' -Bundle 'tpope/vim-haml' -Bundle 'tpope/vim-endwise' +Plugin 'tpope/vim-bundler' +Plugin 'tpope/vim-rake' +Plugin 'tpope/vim-surround' +Plugin 'tpope/vim-haml' +Plugin 'tpope/vim-endwise' diff --git a/vim/search.vim b/vim/search.vim index 783ac51..1b4e59f 100644 --- a/vim/search.vim +++ b/vim/search.vim @@ -6,7 +6,7 @@ set hlsearch " Toggle search highlighting map h :set invhls -Bundle 'kien/ctrlp.vim' +Plugin 'kien/ctrlp.vim' if executable('ag') let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' diff --git a/vim/tmux.vim b/vim/tmux.vim index 5cfa9b3..d5a2887 100644 --- a/vim/tmux.vim +++ b/vim/tmux.vim @@ -1,5 +1,12 @@ -Bundle 'jgdavey/vim-turbux' -Bundle 'jgdavey/tslime.vim' +Plugin 'jgdavey/tslime.vim' +Plugin 'thoughtbot/vim-rspec' +" " use zsh to rerun last command nmap rr :call Send_to_Tmux("r\n") +map t :call RunCurrentSpecFile() +map s :call RunNearestSpec() +map l :call RunLastSpec() +map a :call RunAllSpecs() +let g:rspec_runner = "os_x_iterm" +let g:rspec_command = 'call Send_to_Tmux("rspec {spec}\n")' diff --git a/vim/vundle.vim b/vim/vundle.vim index bed49f2..0ddb76b 100644 --- a/vim/vundle.vim +++ b/vim/vundle.vim @@ -1,4 +1,4 @@ -set rtp+=~/.vim/bundle/vundle/ +set rtp+=~/.vim/bundle/Vundle.vim call vundle#rc() -Bundle 'gmarik/vundle' +Bundle 'gmarik/Vundle.vim' diff --git a/vimrc b/vimrc index c238ea5..4a6f9e4 100644 --- a/vimrc +++ b/vimrc @@ -1,15 +1,15 @@ set nocompatible - -let mapleader = "\\" +filetype off source $HOME/.vim/vundle.vim -Bundle 'othree/html5.vim' -Bundle 'matchit.zip' -Bundle 'tComment' -Bundle 'nelstrom/vim-textobj-rubyblock' -Bundle 'kana/vim-textobj-user' -Bundle 'vim-coffee-script' +Plugin 'othree/html5.vim' +Plugin 'matchit.zip' +Plugin 'tComment' +Plugin 'nelstrom/vim-textobj-rubyblock' +Plugin 'kana/vim-textobj-user' +Plugin 'vim-coffee-script' +Plugin 'tpope/vim-eunuch' source $HOME/.vim/backup_files.vim source $HOME/.vim/clipboard.vim