|
|
|
|
@ -1,19 +1,62 @@
|
|
|
|
|
" pathogen
|
|
|
|
|
call pathogen#runtime_append_all_bundles()
|
|
|
|
|
call pathogen#helptags()
|
|
|
|
|
|
|
|
|
|
" turn off vi compatability, although i hear when vimrc exists this is set
|
|
|
|
|
" automatically
|
|
|
|
|
set nocompatible
|
|
|
|
|
|
|
|
|
|
" allow hidden buffers
|
|
|
|
|
set hidden
|
|
|
|
|
" Vundle stuff
|
|
|
|
|
filetype off
|
|
|
|
|
set rtp+=~/.vim/bundle/vundle/
|
|
|
|
|
call vundle#rc()
|
|
|
|
|
Bundle 'gmarik/vundle'
|
|
|
|
|
|
|
|
|
|
" Custom Bundles:
|
|
|
|
|
Bundle 'groenewege/vim-less'
|
|
|
|
|
Bundle 'digitaltoad/vim-jade'
|
|
|
|
|
Bundle 'pangloss/vim-javascript'
|
|
|
|
|
Bundle 'kchmck/vim-coffee-script'
|
|
|
|
|
Bundle 'jQuery'
|
|
|
|
|
Bundle 'tpope/vim-rails'
|
|
|
|
|
Bundle 'tpope/vim-repeat'
|
|
|
|
|
Bundle 'tpope/vim-surround'
|
|
|
|
|
Bundle 'tpope/vim-fugitive'
|
|
|
|
|
Bundle 'tpope/vim-endwise'
|
|
|
|
|
Bundle 'Lokaltog/vim-powerline'
|
|
|
|
|
Bundle 'Lokaltog/vim-easymotion'
|
|
|
|
|
Bundle 'bkad/CamelCaseMotion'
|
|
|
|
|
Bundle 'majutsushi/tagbar'
|
|
|
|
|
Bundle 'scrooloose/syntastic'
|
|
|
|
|
Bundle 'scrooloose/nerdcommenter'
|
|
|
|
|
" Bundle 'scrooloose/nerdtree'
|
|
|
|
|
Bundle 'altercation/vim-colors-solarized'
|
|
|
|
|
" Bundle 'ervandew/supertab'
|
|
|
|
|
" Bundle 'sjl/gundo.vim'
|
|
|
|
|
Bundle 'kien/ctrlp.vim'
|
|
|
|
|
Bundle 'gregsexton/MatchTag'
|
|
|
|
|
Bundle 'closetag.vim'
|
|
|
|
|
|
|
|
|
|
" Snipmate
|
|
|
|
|
Bundle 'MarcWeber/vim-addon-mw-utils'
|
|
|
|
|
Bundle 'tomtom/tlib_vim'
|
|
|
|
|
Bundle 'snipmate-snippets'
|
|
|
|
|
Bundle 'garbas/vim-snipmate'
|
|
|
|
|
|
|
|
|
|
filetype plugin indent on " last Vundle requirement
|
|
|
|
|
|
|
|
|
|
" longer history
|
|
|
|
|
set history=1000
|
|
|
|
|
syntax enable
|
|
|
|
|
set hidden " allow hidden buffers
|
|
|
|
|
set history=1000 " longer history
|
|
|
|
|
set noswapfile " turn off swapfiles
|
|
|
|
|
set nu " line numbers
|
|
|
|
|
set sc " show the command as it is typed
|
|
|
|
|
set wildmenu
|
|
|
|
|
set wildmode=longest:full
|
|
|
|
|
let mapleader = ","
|
|
|
|
|
set autoread " when a file is changed externally
|
|
|
|
|
set mat=2
|
|
|
|
|
set ruler
|
|
|
|
|
set cursorline " Highlight current line
|
|
|
|
|
set encoding=utf-8 " Necessary to show unicode glyphs
|
|
|
|
|
set laststatus=2 " Always show the statusline
|
|
|
|
|
|
|
|
|
|
" turn off swapfiles
|
|
|
|
|
set noswapfile
|
|
|
|
|
" Powerline
|
|
|
|
|
let g:Powerline_symbols='fancy'
|
|
|
|
|
|
|
|
|
|
" persistent undo
|
|
|
|
|
if v:version > 703
|
|
|
|
|
@ -21,22 +64,6 @@ if v:version > 703
|
|
|
|
|
set undofile
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
" line numbers
|
|
|
|
|
set nu
|
|
|
|
|
|
|
|
|
|
" wild menu
|
|
|
|
|
set wildmenu
|
|
|
|
|
set wildmode=longest:full
|
|
|
|
|
|
|
|
|
|
" show the command as it is typed
|
|
|
|
|
set sc
|
|
|
|
|
|
|
|
|
|
" remap the leader to ,. hate doing this but \ is so far away
|
|
|
|
|
let mapleader = ","
|
|
|
|
|
|
|
|
|
|
" when a file is changed externally
|
|
|
|
|
set autoread
|
|
|
|
|
|
|
|
|
|
" indentation
|
|
|
|
|
filetype plugin on
|
|
|
|
|
filetype indent on
|
|
|
|
|
@ -46,35 +73,35 @@ set smartindent
|
|
|
|
|
" search
|
|
|
|
|
set hlsearch
|
|
|
|
|
set incsearch
|
|
|
|
|
set showmatch
|
|
|
|
|
set smartcase
|
|
|
|
|
set showmatch " matching brackets
|
|
|
|
|
set matchtime=2 " blink brackets
|
|
|
|
|
|
|
|
|
|
" tab stops
|
|
|
|
|
set expandtab
|
|
|
|
|
set smarttab
|
|
|
|
|
set tabstop=4
|
|
|
|
|
set softtabstop=4
|
|
|
|
|
set shiftwidth=4
|
|
|
|
|
|
|
|
|
|
set mat=2
|
|
|
|
|
set ruler
|
|
|
|
|
set expandtab
|
|
|
|
|
set smarttab
|
|
|
|
|
|
|
|
|
|
" so we get html goodies in php files
|
|
|
|
|
au BufRead *.php set ft=php.html
|
|
|
|
|
au BufNewFile *.php set ft=php.html
|
|
|
|
|
|
|
|
|
|
syntax enable
|
|
|
|
|
|
|
|
|
|
" solarized colors
|
|
|
|
|
" Solarized
|
|
|
|
|
set background=dark
|
|
|
|
|
let g:solarized_termtrans=1
|
|
|
|
|
let g:solarized_termcolors=256
|
|
|
|
|
let g:solarized_contrast="high"
|
|
|
|
|
let g:solarized_visibility="high"
|
|
|
|
|
let g:solarized_termcolors=256 "default value is 16
|
|
|
|
|
let g:solarized_contrast="high" "default value is normal
|
|
|
|
|
let g:solarized_visibility="high" "default value is normal
|
|
|
|
|
let g:solarized_diffmode="high" "default value is normal
|
|
|
|
|
let g:solarized_hitrail=1 "default value is 0
|
|
|
|
|
colorscheme solarized
|
|
|
|
|
|
|
|
|
|
" NERDTree
|
|
|
|
|
nnoremap <silent> <leader>n :NERDTreeToggle <CR>
|
|
|
|
|
let NERDTreeMinimalUI=1
|
|
|
|
|
let NERDTreeDirArrows=1
|
|
|
|
|
"nnoremap <silent> <leader>n :NERDTreeToggle <CR>
|
|
|
|
|
"let NERDTreeMinimalUI=1
|
|
|
|
|
"let NERDTreeDirArrows=1
|
|
|
|
|
|
|
|
|
|
" Tagbar
|
|
|
|
|
nnoremap <silent> <leader>t :TagbarToggle <CR>
|
|
|
|
|
@ -84,33 +111,16 @@ if has("gui_running")
|
|
|
|
|
set go=-t
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
" status line. stolen from here:
|
|
|
|
|
" https://github.com/lukaszkorecki/DotFiles/blob/master/vimrc
|
|
|
|
|
set statusline=
|
|
|
|
|
set statusline+=%f\ %2*%m\ %1*%h
|
|
|
|
|
set statusline+=%#warningmsg#
|
|
|
|
|
if v:version > 700
|
|
|
|
|
set statusline+=%{SyntasticStatuslineFlag()}
|
|
|
|
|
endif
|
|
|
|
|
set statusline+=%{fugitive#statusline()}
|
|
|
|
|
set statusline+=%*
|
|
|
|
|
set statusline+=%r%=[%{&encoding}\ %{&fileformat}\ %{strlen(&ft)?&ft:'none'}]
|
|
|
|
|
set statusline+=%15.(%c:%l/%L%)\ %P
|
|
|
|
|
set laststatus=2
|
|
|
|
|
|
|
|
|
|
" Syntastic
|
|
|
|
|
if v:version > 700
|
|
|
|
|
let g:syntastic_enable_signs=1
|
|
|
|
|
let g:syntastic_auto_loc_list=1
|
|
|
|
|
else
|
|
|
|
|
let g:loaded_syntastic_plugin = 1
|
|
|
|
|
let g:loaded_syntastic_plugin=1
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
" Supertab
|
|
|
|
|
let g:SuperTabDefaultCompletionType = "context"
|
|
|
|
|
|
|
|
|
|
" Highlight current line
|
|
|
|
|
set cursorline
|
|
|
|
|
" let g:SuperTabDefaultCompletionType="context"
|
|
|
|
|
|
|
|
|
|
" Highlight column 80
|
|
|
|
|
if version > 702
|
|
|
|
|
@ -120,18 +130,13 @@ endif
|
|
|
|
|
" pretty line endings and trailing spaces
|
|
|
|
|
set list listchars=tab:»·,trail:·,eol:↪
|
|
|
|
|
|
|
|
|
|
" fine I'll try it
|
|
|
|
|
inoremap jk <Esc>
|
|
|
|
|
inoremap kj <Esc>
|
|
|
|
|
|
|
|
|
|
" stop hitting Esc or c-[!
|
|
|
|
|
inoremap <Esc> <nop>
|
|
|
|
|
nnoremap <Esc> :noh<CR><Esc>
|
|
|
|
|
" turn off highlighting
|
|
|
|
|
" nnoremap <Esc> :noh<CR><Esc>
|
|
|
|
|
|
|
|
|
|
" open the current file for edit in Perforce
|
|
|
|
|
nnoremap <leader>p :! p4 edit %<CR>
|
|
|
|
|
|
|
|
|
|
" disable tagbar in old Vim
|
|
|
|
|
if v:version < 703
|
|
|
|
|
let g:loaded_tagbar = 1
|
|
|
|
|
let g:loaded_tagbar=1
|
|
|
|
|
endif
|
|
|
|
|
|
Dustin Swan
12 years ago