Skip to content

Commit

Permalink
Adding vim settings and submodules.
Browse files Browse the repository at this point in the history
  • Loading branch information
emilyst committed Apr 20, 2013
1 parent 1c0a579 commit 5e5ab1b
Show file tree
Hide file tree
Showing 72 changed files with 10,567 additions and 0 deletions.
105 changes: 105 additions & 0 deletions .gitmodules
Expand Up @@ -4,3 +4,108 @@
[submodule ".autoenv"]
path = .autoenv
url = git://github.com/kennethreitz/autoenv.git
[submodule ".vim/bundle/fugitive"]
path = .vim/bundle/fugitive
url = git://github.com/tpope/vim-fugitive.git
[submodule ".vim/bundle/nerdtree"]
path = .vim/bundle/nerdtree
url = git://github.com/scrooloose/nerdtree.git
[submodule ".vim/bundle/abolish"]
path = .vim/bundle/abolish
url = git://github.com/tpope/vim-abolish
[submodule ".vim/bundle/surround"]
path = .vim/bundle/surround
url = git://github.com/tpope/vim-surround
[submodule ".vim/bundle/markdown"]
path = .vim/bundle/markdown
url = git://github.com/tpope/vim-markdown
[submodule ".vim/bundle/gitv"]
path = .vim/bundle/gitv
url = git://github.com/gregsexton/gitv.git
[submodule ".vim/bundle/easymotion"]
path = .vim/bundle/easymotion
url = git://github.com/Lokaltog/vim-easymotion.git
[submodule ".vim/bundle/repeat"]
path = .vim/bundle/repeat
url = git://github.com/tpope/vim-repeat
[submodule ".vim/bundle/visualstar"]
path = .vim/bundle/visualstar
url = git://github.com/thinca/vim-visualstar.git
[submodule ".vim/bundle/css-color"]
path = .vim/bundle/css-color
url = git://github.com/ap/vim-css-color.git
[submodule ".vim/bundle/ruby"]
path = .vim/bundle/ruby
url = git://github.com/vim-ruby/vim-ruby.git
[submodule ".vim/bundle/supertab"]
path = .vim/bundle/supertab
url = git://github.com/tsaleh/vim-supertab.git
[submodule ".vim/bundle/dbext.vim"]
path = .vim/bundle/dbext.vim
url = git://github.com/vim-scripts/dbext.vim.git
[submodule ".vim/bundle/scriptease"]
path = .vim/bundle/scriptease
url = git://github.com/tpope/vim-scriptease.git
[submodule ".vim/bundle/powerline"]
path = .vim/bundle/powerline
url = git://github.com/Lokaltog/vim-powerline.git
[submodule ".vim/bundle/syntastic"]
path = .vim/bundle/syntastic
url = git://github.com/scrooloose/syntastic.git
[submodule ".vim/bundle/tagbar"]
path = .vim/bundle/tagbar
url = git://github.com/majutsushi/tagbar
[submodule ".vim/bundle/ctrlp"]
path = .vim/bundle/ctrlp
url = git://github.com/kien/ctrlp.vim.git
[submodule ".vim/bundle/tabular"]
path = .vim/bundle/tabular
url = git://github.com/godlygeek/tabular.git
[submodule ".vim/bundle/sensible"]
path = .vim/bundle/sensible
url = git://github.com/tpope/vim-sensible.git
[submodule ".vim/bundle/pathogen"]
path = .vim/bundle/pathogen
url = git://github.com/tpope/vim-pathogen.git
[submodule ".vim/bundle/git"]
path = .vim/bundle/git
url = git://github.com/tpope/vim-git.git
[submodule ".vim/bundle/irblack"]
path = .vim/bundle/irblack
url = git://github.com/wgibbs/vim-irblack.git
[submodule ".vim/bundle/colors-solarized"]
path = .vim/bundle/colors-solarized
url = git://github.com/altercation/vim-colors-solarized.git
[submodule ".vim/bundle/characterize"]
path = .vim/bundle/characterize
url = git://github.com/tpope/vim-characterize.git
[submodule ".vim/bundle/less"]
path = .vim/bundle/less
url = git://github.com/groenewege/vim-less.git
[submodule ".vim/bundle/css3-syntax"]
path = .vim/bundle/css3-syntax
url = git://github.com/hail2u/vim-css3-syntax.git
[submodule ".vim/bundle/ack"]
path = .vim/bundle/ack
url = git://github.com/mileszs/ack.vim.git
[submodule ".vim/bundle/snipmate.vim"]
path = .vim/bundle/snipmate.vim
url = git://github.com/msanders/snipmate.vim.git
[submodule ".vim/bundle/gundo.vim"]
path = .vim/bundle/gundo.vim
url = git://github.com/sjl/gundo.vim.git
[submodule ".vim/bundle/nerdtree-tabs"]
path = .vim/bundle/nerdtree-tabs
url = git://github.com/jistr/vim-nerdtree-tabs.git
[submodule ".vim/bundle/unimpaired"]
path = .vim/bundle/unimpaired
url = git://github.com/tpope/vim-unimpaired.git
[submodule ".vim/bundle/commentary"]
path = .vim/bundle/commentary
url = git://github.com/tpope/vim-commentary.git
[submodule ".vim/bundle/speeddating"]
path = .vim/bundle/speeddating
url = git://github.com/tpope/vim-speeddating.git
[submodule ".vim/bundle/dispatch"]
path = .vim/bundle/dispatch
url = git://github.com/tpope/vim-dispatch.git
2 changes: 2 additions & 0 deletions .vim/.gitignore
@@ -0,0 +1,2 @@
.*
!.gitignore
7 changes: 7 additions & 0 deletions .vim/.netrwhist
@@ -0,0 +1,7 @@
let g:netrw_dirhistmax =10
let g:netrw_dirhist_cnt =5
let g:netrw_dirhist_1='/Users/lilix/Projects/home/.git/modules'
let g:netrw_dirhist_2='/Users/lilix/Projects/home/.git/modules/vim'
let g:netrw_dirhist_3='/Users/lilix/Projects/home/.git/modules/vim/bundle'
let g:netrw_dirhist_4='/Users/lilix/.dot'
let g:netrw_dirhist_5='/Users/lilix/.dot/.git'
30 changes: 30 additions & 0 deletions .vim/after/syntax/perl/conceal.vim
@@ -0,0 +1,30 @@
if !has('conceal')
finish
endif


syntax clear perlOperator
syntax keyword perlOperator is

syntax match perlLambda /\(=>\?\s*\)\@<=sub\(\W\)\@=/ conceal cchar=λ
syntax match perlNiceOperator /\<in\>/ conceal cchar=
syntax match perlNiceOperator /\<or\>/ conceal cchar=
syntax match perlNiceOperator /\<and\>/ conceal cchar=
syntax match perlNiceOperator /\<not\>/ conceal cchar=¬
syntax match perlNiceOperator /\<foreach\>/ conceal cchar=
syntax match perlNiceOperator /\<for\>/ conceal cchar=
syntax match perlNiceOperator /\<exists\>/ conceal cchar=
syntax match perlNiceOperator containedin=ALL /<=/ conceal cchar=
syntax match perlNiceOperator containedin=ALL />=/ conceal cchar=
syntax match perlNiceOperator containedin=ALL /==/ conceal cchar=
syntax match perlNiceOperator containedin=ALL /!=/ conceal cchar=
syntax match perlNiceOperator containedin=ALL /=\~/ conceal cchar=
syntax match perlNiceOperator containedin=ALL /!\~/ conceal cchar=
syntax match perlNiceOperator containedin=ALL /=>/ conceal cchar=»
syntax match perlNiceOperator containedin=ALL /\->/ conceal cchar=

hi link perlNiceOperator Operator
hi link perlNiceStatement Statement
hi! link Conceal Operator

setl conceallevel=2
2 changes: 2 additions & 0 deletions .vim/after/syntax/perl/mappings.vim
@@ -0,0 +1,2 @@
noremap K :!perldoc <cword> <bar><bar> perldoc -f <cword><cr>
9 changes: 9 additions & 0 deletions .vim/after/syntax/perl/settings.vim
@@ -0,0 +1,9 @@
set makeprg=perl\ -c\ %\ $*
set errorformat=%f:%l:%m
set keywordprg=perldoc\ -f
set formatprg=perl\ -MText::Autoformat\ -e'autoformat'
set formatoptions=qro
set tabstop=4
set expandtab
set tw=0

18 changes: 18 additions & 0 deletions .vim/after/syntax/perl/variables.vim
@@ -0,0 +1,18 @@
let g:perl_compiler_force_warnings = 0

let perl_moose_stuff = 1
let perl_no_scope_in_variables = 1
let perl_no_sync_on_sub = 1
let perl_no_sync_on_global_var = 1
let perl_extended_vars = 1
let perl_include_pod = 1
let perl_string_as_statement = 1
let perl_sync_dist = 1000
let perl_want_scope_in_variables = 1
let perl_pod_formatting = 1
let perl_pod_spellcheck_headings = 1
"let perl_fold = 1
"let perl_fold_blocks = 1
"let perl_nofold_packages = 1
let perlhelp_prog = '/usr/bin/perldoc'

1 change: 1 addition & 0 deletions .vim/after/syntax/perl/workarounds.vim
@@ -0,0 +1 @@
hi! def link perlSubPrototypeError perlSubPrototype
43 changes: 43 additions & 0 deletions .vim/after/syntax/python.vim
@@ -0,0 +1,43 @@
set tabstop=4
set expandtab
set tw=0

" we need the conceal feature (vim ≥ 7.3)
if !has('conceal')
finish
endif

" remove the keywords. we'll re-add them below
syntax clear pythonOperator

syntax match pythonOperator "\<is\>"

syntax match pyNiceOperator "\<for\>" conceal cchar=
syntax match pyNiceOperator "\<in\>" conceal cchar=
syntax match pyNiceOperator "\<or\>" conceal cchar=
syntax match pyNiceOperator "\<and\>" conceal cchar=
" include the space after “not” – if present – so that “not a” becomes “¬a”.
" also, don't hide “not” behind ‘¬’ if it is after “is ”.
syntax match pyNiceOperator "\%(is \)\@<!\<not\%( \|\>\)" conceal cchar=¬
syntax match pyNiceOperator "\<not in\>" conceal cchar=
syntax match pyNiceOperator "<=" conceal cchar=
syntax match pyNiceOperator ">=" conceal cchar=
" only conceal “==” if alone, to avoid concealing SCM conflict markers
syntax match pyNiceOperator "=\@<!===\@!" conceal cchar=
syntax match pyNiceOperator "!=" conceal cchar=

syntax keyword pyNiceOperator sum conceal cchar=
syntax match pyNiceOperator "\<\%(math\.\)\?sqrt\>" conceal cchar=
syntax match pyNiceKeyword "\<\%(math\.\)\?pi\>" conceal cchar=π

syntax keyword pyNiceStatement lambda conceal cchar=λ



hi link pyNiceOperator Operator
hi link pyNiceStatement Statement
hi link pyNiceKeyword Keyword
hi! link Conceal Operator

setlocal conceallevel=2
setlocal concealcursor=i
3 changes: 3 additions & 0 deletions .vim/after/syntax/ruby/settings.vim
@@ -0,0 +1,3 @@
set expandtab
set tabstop=2 shiftwidth=2 softtabstop=2
set autoindent
1 change: 1 addition & 0 deletions .vim/after/syntax/sh/settings.vim
@@ -0,0 +1 @@
set formatoptions=tqron1

0 comments on commit 5e5ab1b

Please sign in to comment.