summaryrefslogtreecommitdiffstats
path: root/.vimrc
diff options
context:
space:
mode:
Diffstat (limited to '.vimrc')
-rw-r--r--.vimrc25
1 files changed, 12 insertions, 13 deletions
diff --git a/.vimrc b/.vimrc
index ceb7adf..611517d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -6,26 +6,29 @@ call vundle#begin()
Plugin 'gmarik/Vundle.vim'
-Plugin 'Valloric/MatchTagAlways'
-Plugin 'vim-scripts/bufexplorer.zip'
Plugin 'kien/ctrlp.vim'
Plugin 'editorconfig/editorconfig-vim'
-Plugin 'scrooloose/nerdcommenter'
-Plugin 'scrooloose/nerdtree'
Plugin 'godlygeek/tabular'
Plugin 'SirVer/ultisnips'
Plugin 'bling/vim-airline'
Plugin 'kchmck/vim-coffee-script'
-" Plugin 'szw/vim-ctrlspace'
-Plugin 'tpope/vim-fugitive'
Plugin 'airblade/vim-gitgutter'
-Plugin 'tpope/vim-haml'
Plugin 'maksimr/vim-jsbeautify'
-Plugin 'tpope/vim-rails'
Plugin 'ngmy/vim-rubocop'
-Plugin 'vim-ruby/vim-ruby'
+" Plugin 'szw/vim-ctrlspace'
+" Plugin 'vim-ruby/vim-ruby'
Plugin 'honza/vim-snippets'
+Plugin 'scrooloose/nerdcommenter'
+Plugin 'scrooloose/nerdtree'
+Plugin 'Valloric/MatchTagAlways'
Plugin 'Valloric/YouCompleteMe'
+Plugin 'vim-scripts/bufexplorer.zip'
+" Plugin 'vim-scripts/matchit.zip'
+Plugin 'tpope/vim-fugitive'
+Plugin 'tpope/vim-rails'
+Plugin 'tpope/vim-endwise'
+Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-haml'
call vundle#end()
syntax on
@@ -85,10 +88,6 @@ set splitbelow " position the preview window below current windows
if !empty(&viminfo)
set viminfo^=!
endif
-" Load matchit.vim, but only if the user hasn't installed a newer version.
-if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
- runtime! macros/matchit.vim
-endif
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" => Mappings