Skip to content

Commit

Permalink
Update vundle.vim
Browse files Browse the repository at this point in the history
  • Loading branch information
joshuaclayton committed Dec 4, 2014
1 parent fd1585b commit e449419
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 23 deletions.
2 changes: 1 addition & 1 deletion vim/clipboard.vim
@@ -1,3 +1,3 @@
Bundle 'sickill/vim-pasta'
Plugin 'sickill/vim-pasta'

set clipboard=unnamed
2 changes: 1 addition & 1 deletion vim/colors.vim
@@ -1,4 +1,4 @@
Bundle 'altercation/vim-colors-solarized'
Plugin 'altercation/vim-colors-solarized'

set t_Co=256
colorscheme solarized
Expand Down
4 changes: 2 additions & 2 deletions vim/git.vim
@@ -1,2 +1,2 @@
Bundle 'tpope/vim-fugitive'
Bundle 'mattn/gist-vim'
Plugin 'tpope/vim-fugitive'
Plugin 'mattn/gist-vim'
2 changes: 1 addition & 1 deletion vim/rails.vim
@@ -1,4 +1,4 @@
Bundle 'tpope/vim-rails'
Plugin 'tpope/vim-rails'

let g:rails_projections = {
\ "app/constraints/*_constraint.rb": {
Expand Down
10 changes: 5 additions & 5 deletions 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'
2 changes: 1 addition & 1 deletion vim/search.vim
Expand Up @@ -6,7 +6,7 @@ set hlsearch
" Toggle search highlighting
map <Leader>h :set invhls <CR>
Bundle 'kien/ctrlp.vim'
Plugin 'kien/ctrlp.vim'

if executable('ag')
let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
Expand Down
11 changes: 9 additions & 2 deletions 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 <Leader>rr :call Send_to_Tmux("r\n")<CR>
map <Leader>t :call RunCurrentSpecFile()<CR>
map <Leader>s :call RunNearestSpec()<CR>
map <Leader>l :call RunLastSpec()<CR>
map <Leader>a :call RunAllSpecs()<CR>
let g:rspec_runner = "os_x_iterm"
let g:rspec_command = 'call Send_to_Tmux("rspec {spec}\n")'
4 changes: 2 additions & 2 deletions 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'
16 changes: 8 additions & 8 deletions 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
Expand Down

0 comments on commit e449419

Please sign in to comment.