Merge branch 'master' of git://github.com/dustinswan/dotfiles
This commit is contained in:
Dustin Swan
commit
e3ccc87b8c
35 changed files with 106 additions and 413 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
vim/bundle/*
|
||||
!vim/bundle/vundle/*
|
||||
85
.gitmodules
vendored
85
.gitmodules
vendored
|
|
@ -1,84 +1,3 @@
|
|||
[submodule "vim/bundle/fugitive"]
|
||||
path = vim/bundle/fugitive
|
||||
url = git://github.com/tpope/vim-fugitive.git
|
||||
[submodule "vim/bundle/closetag"]
|
||||
path = vim/bundle/closetag
|
||||
url = git://github.com/docunext/closetag.vim.git
|
||||
[submodule "vim/bundle/supertab"]
|
||||
path = vim/bundle/supertab
|
||||
url = git://github.com/ervandew/supertab.git
|
||||
[submodule "vim/bundle/tagbar"]
|
||||
path = vim/bundle/tagbar
|
||||
url = git://github.com/majutsushi/tagbar.git
|
||||
[submodule "vim/bundle/solarized"]
|
||||
path = vim/bundle/solarized
|
||||
url = git://github.com/altercation/vim-colors-solarized.git
|
||||
[submodule "vim/bundle/surround"]
|
||||
path = vim/bundle/surround
|
||||
url = git://github.com/tpope/vim-surround.git
|
||||
[submodule "vim/bundle/javascript"]
|
||||
path = vim/bundle/javascript
|
||||
url = git://github.com/pangloss/vim-javascript
|
||||
[submodule "vim/bundle/nerdtree"]
|
||||
path = vim/bundle/nerdtree
|
||||
url = git://github.com/scrooloose/nerdtree
|
||||
[submodule "vim/bundle/repeat"]
|
||||
path = vim/bundle/repeat
|
||||
url = git://github.com/tpope/vim-repeat
|
||||
[submodule "vim/bundle/syntastic"]
|
||||
path = vim/bundle/syntastic
|
||||
url = git://github.com/scrooloose/syntastic
|
||||
[submodule "vim/bundle/snipmate"]
|
||||
path = vim/bundle/snipmate
|
||||
url = git://github.com/garbas/vim-snipmate.git
|
||||
[submodule "vim/bundle/tlib"]
|
||||
path = vim/bundle/tlib
|
||||
url = git://github.com/tomtom/tlib_vim.git
|
||||
[submodule "vim/bundle/vim-addon-mw-utils"]
|
||||
path = vim/bundle/vim-addon-mw-utils
|
||||
url = git://github.com/MarcWeber/vim-addon-mw-utils.git
|
||||
[submodule "vim/bundle/snipmate-snippets"]
|
||||
path = vim/bundle/snipmate-snippets
|
||||
url = git://github.com/honza/snipmate-snippets.git
|
||||
[submodule "vim/bundle/easymotion"]
|
||||
path = vim/bundle/easymotion
|
||||
url = git://github.com/Lokaltog/vim-easymotion
|
||||
[submodule "vim/bundle/nerdcommenter"]
|
||||
path = vim/bundle/nerdcommenter
|
||||
url = git://github.com/scrooloose/nerdcommenter
|
||||
[submodule "vim/bundle/vim-jade"]
|
||||
path = vim/bundle/vim-jade
|
||||
url = git://github.com/digitaltoad/vim-jade
|
||||
[submodule "vim/bundle/vim-less"]
|
||||
path = vim/bundle/vim-less
|
||||
url = git://github.com/groenewege/vim-less
|
||||
[submodule "ShowMarks"]
|
||||
path = ShowMarks
|
||||
url = git://github.com/vim-scripts/ShowMarks
|
||||
[submodule "vim/bundle/ShowMarks"]
|
||||
path = vim/bundle/ShowMarks
|
||||
url = git://github.com/vim-scripts/ShowMarks
|
||||
[submodule "vim/bundle/CamelCaseMotion"]
|
||||
path = vim/bundle/CamelCaseMotion
|
||||
url = git://github.com/bkad/CamelCaseMotion
|
||||
[submodule "vim/bundle/gundo"]
|
||||
path = vim/bundle/gundo
|
||||
url = git://github.com/sjl/gundo.vim
|
||||
[submodule "oh-my-zsh"]
|
||||
path = oh-my-zsh
|
||||
url = git://github.com/robbyrussell/oh-my-zsh
|
||||
[submodule "vim/bundle/MatchTag"]
|
||||
path = vim/bundle/MatchTag
|
||||
url = git://github.com/gregsexton/MatchTag
|
||||
[submodule "vim/bundle/vim-rails"]
|
||||
path = vim/bundle/vim-rails
|
||||
url = git://github.com/tpope/vim-rails
|
||||
[submodule "vim/bundle/endwise"]
|
||||
path = vim/bundle/endwise
|
||||
url = git://github.com/tpope/vim-endwise
|
||||
[submodule "vim/bundle/ctrlp"]
|
||||
path = vim/bundle/ctrlp
|
||||
url = git://github.com/kien/ctrlp.vim
|
||||
[submodule "vim/bundle/vim-powerline"]
|
||||
path = vim/bundle/vim-powerline
|
||||
url = git://github.com/Lokaltog/vim-powerline
|
||||
path = oh-my-zsh
|
||||
url = git://github.com/robbyrussell/oh-my-zsh
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[user]
|
||||
name = Dustin Swan
|
||||
email = dustinswan@gmail.com
|
||||
name = Dustin Swan
|
||||
email = dustinswan@gmail.com
|
||||
|
||||
[alias]
|
||||
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 7a41498b0d4f68c537d494b5f849913361315fde
|
||||
Subproject commit 1120f973054836eeb53750f57d69fbec41a340dc
|
||||
22
tmux.conf
22
tmux.conf
|
|
@ -19,3 +19,25 @@ 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"
|
||||
set -g status-fg white
|
||||
set -g status-bg colour234
|
||||
set -g window-status-activity-attr bold
|
||||
set -g pane-border-fg colour245
|
||||
set -g pane-active-border-fg colour39
|
||||
set -g message-fg colour16
|
||||
set -g message-bg colour221
|
||||
set -g message-attr bold
|
||||
|
||||
# Stole Steve Losh's status line: https://github.com/sjl/dotfiles/blob/master/tmux/tmux.conf
|
||||
# Powerline symbols: ⮂ ⮃ ⮀ ⮁ ⭤
|
||||
set -g status-left-length 32
|
||||
set -g status-right-length 150
|
||||
set -g status-interval 5
|
||||
|
||||
set -g status-left '#[fg=colour238,bg=colour234,nobold]⮀'
|
||||
|
||||
set -g status-right '#[fg=colour245]⮃ %R ⮃ %d %b #[fg=colour254,bg=colour234,nobold]⮂#[fg=colour16,bg=colour254,bold] #h '
|
||||
set -g window-status-format "#[fg=white,bg=colour234] #I #W "
|
||||
set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour16,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,230 +0,0 @@
|
|||
" pathogen.vim - path option manipulation
|
||||
" Maintainer: Tim Pope <http://tpo.pe/>
|
||||
" Version: 2.0
|
||||
|
||||
" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
|
||||
"
|
||||
" For management of individually installed plugins in ~/.vim/bundle (or
|
||||
" ~\vimfiles\bundle), adding `call pathogen#infect()` to your .vimrc
|
||||
" prior to `fileype plugin indent on` is the only other setup necessary.
|
||||
"
|
||||
" The API is documented inline below. For maximum ease of reading,
|
||||
" :set foldmethod=marker
|
||||
|
||||
if exists("g:loaded_pathogen") || &cp
|
||||
finish
|
||||
endif
|
||||
let g:loaded_pathogen = 1
|
||||
|
||||
" Point of entry for basic default usage. Give a directory name to invoke
|
||||
" pathogen#runtime_append_all_bundles() (defaults to "bundle"), or a full path
|
||||
" to invoke pathogen#runtime_prepend_subdirectories(). Afterwards,
|
||||
" pathogen#cycle_filetype() is invoked.
|
||||
function! pathogen#infect(...) abort " {{{1
|
||||
let source_path = a:0 ? a:1 : 'bundle'
|
||||
if source_path =~# '[\\/]'
|
||||
call pathogen#runtime_prepend_subdirectories(source_path)
|
||||
else
|
||||
call pathogen#runtime_append_all_bundles(source_path)
|
||||
endif
|
||||
call pathogen#cycle_filetype()
|
||||
endfunction " }}}1
|
||||
|
||||
" Split a path into a list.
|
||||
function! pathogen#split(path) abort " {{{1
|
||||
if type(a:path) == type([]) | return a:path | endif
|
||||
let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
|
||||
return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
|
||||
endfunction " }}}1
|
||||
|
||||
" Convert a list to a path.
|
||||
function! pathogen#join(...) abort " {{{1
|
||||
if type(a:1) == type(1) && a:1
|
||||
let i = 1
|
||||
let space = ' '
|
||||
else
|
||||
let i = 0
|
||||
let space = ''
|
||||
endif
|
||||
let path = ""
|
||||
while i < a:0
|
||||
if type(a:000[i]) == type([])
|
||||
let list = a:000[i]
|
||||
let j = 0
|
||||
while j < len(list)
|
||||
let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
|
||||
let path .= ',' . escaped
|
||||
let j += 1
|
||||
endwhile
|
||||
else
|
||||
let path .= "," . a:000[i]
|
||||
endif
|
||||
let i += 1
|
||||
endwhile
|
||||
return substitute(path,'^,','','')
|
||||
endfunction " }}}1
|
||||
|
||||
" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
|
||||
function! pathogen#legacyjoin(...) abort " {{{1
|
||||
return call('pathogen#join',[1] + a:000)
|
||||
endfunction " }}}1
|
||||
|
||||
" Remove duplicates from a list.
|
||||
function! pathogen#uniq(list) abort " {{{1
|
||||
let i = 0
|
||||
let seen = {}
|
||||
while i < len(a:list)
|
||||
if has_key(seen,a:list[i])
|
||||
call remove(a:list,i)
|
||||
else
|
||||
let seen[a:list[i]] = 1
|
||||
let i += 1
|
||||
endif
|
||||
endwhile
|
||||
return a:list
|
||||
endfunction " }}}1
|
||||
|
||||
" \ on Windows unless shellslash is set, / everywhere else.
|
||||
function! pathogen#separator() abort " {{{1
|
||||
return !exists("+shellslash") || &shellslash ? '/' : '\'
|
||||
endfunction " }}}1
|
||||
|
||||
" Convenience wrapper around glob() which returns a list.
|
||||
function! pathogen#glob(pattern) abort " {{{1
|
||||
let files = split(glob(a:pattern),"\n")
|
||||
return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
|
||||
endfunction "}}}1
|
||||
|
||||
" Like pathogen#glob(), only limit the results to directories.
|
||||
function! pathogen#glob_directories(pattern) abort " {{{1
|
||||
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
|
||||
endfunction "}}}1
|
||||
|
||||
" Turn filetype detection off and back on again if it was already enabled.
|
||||
function! pathogen#cycle_filetype() " {{{1
|
||||
if exists('g:did_load_filetypes')
|
||||
filetype off
|
||||
filetype on
|
||||
endif
|
||||
endfunction " }}}1
|
||||
|
||||
" Checks if a bundle is 'disabled'. A bundle is considered 'disabled' if
|
||||
" its 'basename()' is included in g:pathogen_disabled[]' or ends in a tilde.
|
||||
function! pathogen#is_disabled(path) " {{{1
|
||||
if a:path =~# '\~$'
|
||||
return 1
|
||||
elseif !exists("g:pathogen_disabled")
|
||||
return 0
|
||||
endif
|
||||
let sep = pathogen#separator()
|
||||
return index(g:pathogen_disabled, strpart(a:path, strridx(a:path, sep)+1)) != -1
|
||||
endfunction "}}}1
|
||||
|
||||
" Prepend all subdirectories of path to the rtp, and append all 'after'
|
||||
" directories in those subdirectories.
|
||||
function! pathogen#runtime_prepend_subdirectories(path) " {{{1
|
||||
let sep = pathogen#separator()
|
||||
let before = filter(pathogen#glob_directories(a:path.sep."*"), '!pathogen#is_disabled(v:val)')
|
||||
let after = filter(pathogen#glob_directories(a:path.sep."*".sep."after"), '!pathogen#is_disabled(v:val[0:-7])')
|
||||
let rtp = pathogen#split(&rtp)
|
||||
let path = expand(a:path)
|
||||
call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
|
||||
let &rtp = pathogen#join(pathogen#uniq(before + rtp + after))
|
||||
return &rtp
|
||||
endfunction " }}}1
|
||||
|
||||
" For each directory in rtp, check for a subdirectory named dir. If it
|
||||
" exists, add all subdirectories of that subdirectory to the rtp, immediately
|
||||
" after the original directory. If no argument is given, 'bundle' is used.
|
||||
" Repeated calls with the same arguments are ignored.
|
||||
function! pathogen#runtime_append_all_bundles(...) " {{{1
|
||||
let sep = pathogen#separator()
|
||||
let name = a:0 ? a:1 : 'bundle'
|
||||
if "\n".s:done_bundles =~# "\\M\n".name."\n"
|
||||
return ""
|
||||
endif
|
||||
let s:done_bundles .= name . "\n"
|
||||
let list = []
|
||||
for dir in pathogen#split(&rtp)
|
||||
if dir =~# '\<after$'
|
||||
let list += filter(pathogen#glob_directories(substitute(dir,'after$',name,'').sep.'*[^~]'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
|
||||
else
|
||||
let list += [dir] + filter(pathogen#glob_directories(dir.sep.name.sep.'*[^~]'), '!pathogen#is_disabled(v:val)')
|
||||
endif
|
||||
endfor
|
||||
let &rtp = pathogen#join(pathogen#uniq(list))
|
||||
return 1
|
||||
endfunction
|
||||
|
||||
let s:done_bundles = ''
|
||||
" }}}1
|
||||
|
||||
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
|
||||
function! pathogen#helptags() " {{{1
|
||||
let sep = pathogen#separator()
|
||||
for dir in pathogen#split(&rtp)
|
||||
if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(glob(dir.sep.'doc'.sep.'*')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
|
||||
helptags `=dir.'/doc'`
|
||||
endif
|
||||
endfor
|
||||
endfunction " }}}1
|
||||
|
||||
command! -bar Helptags :call pathogen#helptags()
|
||||
|
||||
" Like findfile(), but hardcoded to use the runtimepath.
|
||||
function! pathogen#runtime_findfile(file,count) "{{{1
|
||||
let rtp = pathogen#join(1,pathogen#split(&rtp))
|
||||
return fnamemodify(findfile(a:file,rtp,a:count),':p')
|
||||
endfunction " }}}1
|
||||
|
||||
function! s:find(count,cmd,file,lcd) " {{{1
|
||||
let rtp = pathogen#join(1,pathogen#split(&runtimepath))
|
||||
let file = pathogen#runtime_findfile(a:file,a:count)
|
||||
if file ==# ''
|
||||
return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
|
||||
elseif a:lcd
|
||||
let path = file[0:-strlen(a:file)-2]
|
||||
execute 'lcd `=path`'
|
||||
return a:cmd.' '.fnameescape(a:file)
|
||||
else
|
||||
return a:cmd.' '.fnameescape(file)
|
||||
endif
|
||||
endfunction " }}}1
|
||||
|
||||
function! s:Findcomplete(A,L,P) " {{{1
|
||||
let sep = pathogen#separator()
|
||||
let cheats = {
|
||||
\'a': 'autoload',
|
||||
\'d': 'doc',
|
||||
\'f': 'ftplugin',
|
||||
\'i': 'indent',
|
||||
\'p': 'plugin',
|
||||
\'s': 'syntax'}
|
||||
if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
|
||||
let request = cheats[a:A[0]].a:A[1:-1]
|
||||
else
|
||||
let request = a:A
|
||||
endif
|
||||
let pattern = substitute(request,'\'.sep,'*'.sep,'g').'*'
|
||||
let found = {}
|
||||
for path in pathogen#split(&runtimepath)
|
||||
let matches = split(glob(path.sep.pattern),"\n")
|
||||
call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
|
||||
call map(matches,'v:val[strlen(path)+1:-1]')
|
||||
for match in matches
|
||||
let found[match] = 1
|
||||
endfor
|
||||
endfor
|
||||
return sort(keys(found))
|
||||
endfunction " }}}1
|
||||
|
||||
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(<count>,'edit<bang>',<q-args>,0)
|
||||
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(<count>,'edit<bang>',<q-args>,0)
|
||||
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(<count>,'edit<bang>',<q-args>,1)
|
||||
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(<count>,'split',<q-args>,<bang>1)
|
||||
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
|
||||
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
|
||||
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(<count>,'pedit',<q-args>,<bang>1)
|
||||
command! -bar -bang -count=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(<count>,'read',<q-args>,<bang>1)
|
||||
|
||||
" vim:set ft=vim ts=8 sw=2 sts=2:
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 224aa0955a522c59b1f9074199400a5da1a804ce
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit c7702ab0d6eb5bf10dc7cd12004e9d3f693f0fd3
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit ef22709d8ebba137819ab0e60db5463b480934cd
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 060109359b81b53dfad7206e23f86007d895996f
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 420174fc537ba986a716964db7af0bd189252944
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 667a668e114e9ec0e5d4cbcb0962d835b23614c4
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit b4b75ef682da3e946c648d3634ade39d0af49aba
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 50092711ff831742cece76f3322674858863e3f3
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit e66f9019b4eca05d7f5dfe38c742cf42e641e98d
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit f4d9f99f67189aa5725fdfc4c13fd33089446ccc
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit eced5f98a0724cd6498b70024b3edec1e7b29b2e
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit cdffdd43816ddaeee858ae42da3ab6ddcfa25d19
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 4cef3fca6969155698cda224acfb0843c2d6c6b4
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 57daa7bfa737a12c7157cbdd828b669faf885925
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit ac395b57fec47f034cba151d01669d134ac7041b
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 4eb2cdfccc016889acfa3b5d63e8f390a87863cf
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 2616623bb9208c4bf2559b6aa5c1eff53644a0f7
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 81cfb3f9038ca6de5716dc170212e29dfb0bf94f
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit d6c56d4bae4f1e8908b64bc6bf0cbd6480081f49
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit a2676b4225b8a370b9e7046c5fc2f5ad1155e590
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 981b39bd2dcd839746509328e69c5053b8871d04
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 3c2a265b89d1d9848633cfc1642d2e78ecd73a25
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 90c17556d79689697c43df5c94ae9e00dbc73fdf
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit e45164cbba5beee4bd65096dad31f31124a2cc18
|
||||
1
vim/bundle/vundle
Submodule
1
vim/bundle/vundle
Submodule
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 03ed2bd39e37c5ff035c05197af81558eb5d8a89
|
||||
145
vimrc
145
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,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
|
||||
|
|
|
|||
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