andrei-stoica
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed merge conflict

This commit is contained in:
Andrei Stoica 2019-01-29 13:38:17 -05:00
parent b10082d331 89950b31ad
commit fecc31cf2c
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.vimrc
View File

@ -1,29 +1,34 @@
set nocompatible " be iMproved, required set nocompatible " be iMproved, required
filetype on " required filetype on " required
if empty(glob("~/.vim/bundle/Vundle.vim"))
execute '!git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim'
autocmd VimEnter * silent! PluginInstall
endif
" set the runtime path to include Vundle and initialize " set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin() call vundle#begin()
" alternatively, pass a path where Vundle should install plugins " alternatively, pass a path where Vundle should install plugins
"call vundle#begin('~/some/path/here') "call vundle#begin('~/some/path/here')
" let Vundle manage Vundle, required " let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim' Plugin 'VundleVim/Vundle.vim'
Plugin 'scrooloose/nerdtree' Plugin 'scrooloose/nerdtree'
Plugin 'digitaltoad/vim-pug' Plugin 'digitaltoad/vim-pug'
Plugin 'itchyny/lightline.vim' Plugin 'itchyny/lightline.vim'
Plugin 'airblade/vim-gitgutter' Plugin 'airblade/vim-gitgutter'
Plugin 'suan/vim-instant-markdown' Plugin 'suan/vim-instant-markdown'
Plugin 'xuhdev/vim-latex-live-preview' Plugin 'xuhdev/vim-latex-live-preview'
Plugin 'kien/rainbow_parentheses.vim' Plugin 'kien/rainbow_parentheses.vim'
" All of your Plugins must be added before the following line " All of your Plugins must be added before the following line
call vundle#end() " required call vundle#end() " required
filetype plugin indent on " required filetype plugin indent on " required
" To ignore plugin indent changes, instead use: " To ignore plugin indent changes, instead use: