Skip to content

Commit

Permalink
switch to plug
Browse files Browse the repository at this point in the history
  • Loading branch information
trosborn committed Aug 30, 2017
1 parent f42465a commit f72310e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 22 deletions.
4 changes: 2 additions & 2 deletions tmux.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
bind \ split-window -h
bind - split-window -v
bind h split-window -h
bind v split-window -v

bind -n M-Left select-pane -L
bind -n M-Right select-pane -R
Expand Down
35 changes: 15 additions & 20 deletions vimrc
Original file line number Diff line number Diff line change
@@ -1,31 +1,26 @@
set nocompatible
filetype off
if empty(glob('~/.vim/autoload/plug.vim'))
silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
\ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
endif

" set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
call plug#begin('~/.vim/plugged')

" let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim'
Bundle 'w0ng/vim-hybrid'
Bundle 'bling/vim-airline'
Plug 'pangloss/vim-javascript'
Plug 'w0ng/vim-hybrid'
Plug 'Raimondi/delimitMate'

" play nice with iterm2
Bundle 'sjl/vitality.vim'
Plug 'Valloric/YouCompleteMe'

" Git stuff
Bundle 'tpope/vim-fugitive'
Bundle 'airblade/vim-gitgutter'
Plug 'bling/vim-airline'

" Automatic end statements
Bundle 'tpope/vim-endwise'
Plug 'sjl/vitality.vim'

" Syntax error reporter
Bundle "scrooloose/syntastic"
Plug 'tpope/vim-fugitive'
Plug 'airblade/vim-gitgutter'

" All of your Plugins must be added before the following line
call vundle#end() " required
filetype plugin indent on " required
Plug 'tpope/vim-endwise'

set autowrite " Automatically :write before running commands
set tabstop=2
Expand Down

0 comments on commit f72310e

Please sign in to comment.