Trying out Vundle instead of Pathogen.
This commit is contained in:
Dustin Swan
parent
8c04f028b0
commit
0d6c1ab0ee
12 changed files with 86 additions and 79 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
vim
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 7a41498b0d4f68c537d494b5f849913361315fde
|
||||
Subproject commit 1120f973054836eeb53750f57d69fbec41a340dc
|
||||
|
|
@ -19,3 +19,4 @@ set-window-option -g mode-keys vi # vi key
|
|||
set-option -g status-keys vi
|
||||
set-window-option -g utf8 on # utf8 support
|
||||
|
||||
set -g default-terminal "screen-256color"
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit f4d9f99f67189aa5725fdfc4c13fd33089446ccc
|
||||
Subproject commit 98cec44ef6e8c93f89fb7911a03d7eaa75fe1249
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 57daa7bfa737a12c7157cbdd828b669faf885925
|
||||
Subproject commit 0122ba5e07ed53d42cf07810bc60bbb74e1afe7c
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 2616623bb9208c4bf2559b6aa5c1eff53644a0f7
|
||||
Subproject commit 7a5bca349c19bf7a43b316193748ca46d76ed716
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 81cfb3f9038ca6de5716dc170212e29dfb0bf94f
|
||||
Subproject commit a9209b43675b333451e673774509c37eca0defae
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 981b39bd2dcd839746509328e69c5053b8871d04
|
||||
Subproject commit 77d83abc6c8e6c18fc91446c7cf2deebd4848a29
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 90c17556d79689697c43df5c94ae9e00dbc73fdf
|
||||
Subproject commit 99277d9eed97a59cacc1db8c1dece2bcfd96d877
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit e45164cbba5beee4bd65096dad31f31124a2cc18
|
||||
Subproject commit b6720d68c2d315fc1f6f4d78ee7d7a97475571e1
|
||||
141
vimrc
141
vimrc
|
|
@ -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'
|
||||
|
||||
" longer history
|
||||
set history=1000
|
||||
" 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'
|
||||
|
||||
" turn off swapfiles
|
||||
set noswapfile
|
||||
" 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
|
||||
|
||||
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
|
||||
|
||||
" 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 tabstop=4
|
||||
set softtabstop=4
|
||||
set shiftwidth=4
|
||||
set expandtab
|
||||
set smarttab
|
||||
set tabstop=4
|
||||
set shiftwidth=4
|
||||
|
||||
set mat=2
|
||||
set ruler
|
||||
|
||||
" 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,20 +111,6 @@ 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
|
||||
|
|
@ -107,10 +120,7 @@ else
|
|||
endif
|
||||
|
||||
" Supertab
|
||||
let g:SuperTabDefaultCompletionType = "context"
|
||||
|
||||
" Highlight current line
|
||||
set cursorline
|
||||
" let g:SuperTabDefaultCompletionType="context"
|
||||
|
||||
" Highlight column 80
|
||||
if version > 702
|
||||
|
|
@ -120,13 +130,8 @@ 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>
|
||||
|
|
|
|||
2
zshrc
2
zshrc
|
|
@ -31,7 +31,7 @@ source $ZSH/oh-my-zsh.sh
|
|||
|
||||
# Customize to your needs...
|
||||
alias vi=vim
|
||||
export TERM="screen-256color"
|
||||
# export TERM="screen-256color"
|
||||
export EDITOR=vim
|
||||
|
||||
export PATH="/usr/local/bin:$PATH"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue