diff --git a/vimrc b/vimrc index b9bac27..7114a3e 100644 --- a/vimrc +++ b/vimrc @@ -1,19 +1,9 @@ " Don't try to be vi compatible set nocompatible -" Helps force plugins to load correctly when it is turned back on below -filetype off - " TODO: Load plugins here (pathogen or vundle) " Turn on syntax highlighting syntax on - -" For plugins to load correctly -filetype plugin indent on - -" TODO: Pick a leader key -" let mapleader = "," - " Security set modelines=0 @@ -30,8 +20,6 @@ set visualbell set encoding=utf-8 " Whitespace -set wrap -set textwidth=79 set formatoptions=tcqrn1 set tabstop=2 set shiftwidth=2 @@ -43,8 +31,6 @@ set noshiftround set scrolloff=3 set backspace=indent,eol,start set matchpairs+=<:> " use % to jump between pairs -runtime! macros/matchit.vim - " Move up/down editor lines nnoremap j gj nnoremap k gk @@ -63,8 +49,6 @@ set showmode set showcmd " Searching -"nnoremap / /\v -"vnoremap / /\v set hlsearch set incsearch set ignorecase @@ -80,13 +64,6 @@ vnoremap :set invfullscreen " Formatting map q gqip -" Visualize tabs and newlines -set listchars=tab:▸\ ,eol:¬ -" Uncomment this to enable by default: -" set list " To enable by default -" Or use your leader key + l to toggle on/off -map l :set list! " Toggle tabs and EOL - set t_Co=256 set background=dark let g:solarized_termcolors=256 @@ -99,30 +76,15 @@ filetype off " required " set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() -" alternatively, pass a path where Vundle should install plugins "call vundle#begin('~/some/path/here') - -" let Vundle manage Vundle, required Plugin 'VundleVim/Vundle.vim' Plugin 'tomasiser/vim-code-dark' -" The following are examples of different formats supported. -" Keep Plugin commands between vundle#begin/end. -" plugin on GitHub repo Plugin 'tpope/vim-fugitive' -" plugin from http://vim-scripts.org/vim/scripts.html -" Plugin 'L9' -" Git plugin not hosted on GitHub Plugin 'git://git.wincent.com/command-t.git' -" git repos on your local machine (i.e. when working on your own plugin) -" The sparkup vim script is in a subdirectory of this repo called vim. -" Pass the path to set the runtimepath properly. -Plugin 'rstacruz/sparkup', {'rtp': 'vim/'} -" Install L9 and avoid a Naming conflict if you've already installed a -" different version somewhere else. -" Plugin 'ascenator/L9', {'name': 'newL9'} Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline-themes' Plugin 'preservim/nerdtree' +Plugin 'Xuyuanp/nerdtree-git-plugin' " All of your Plugins must be added before the following line call vundle#end() " required filetype plugin indent on " required