From a79e9406af2bb9157e03b387dff05413969e5754 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Tue, 15 Sep 2015 13:12:05 -0400 Subject: [PATCH] #GrammarNazi --- README.md | 5 ++ bash_aliases | 20 +++++ vim/.netrwhist | 10 +++ vim/bundle/Vundle.vim | 1 + vim/bundle/ctags.vim | 1 + vim/bundle/ctrlp.vim | 1 + vim/bundle/dash.vim | 1 + vim/bundle/matchit.zip | 1 + vim/bundle/rename.vim | 1 + vim/bundle/syntastic | 1 + vim/bundle/tComment | 1 + vim/bundle/vim-airline | 1 + vim/bundle/vim-bundler | 1 + vim/bundle/vim-coffee-script | 1 + vim/bundle/vim-colors-github | 1 + vim/bundle/vim-endwise | 1 + vim/bundle/vim-fugitive | 1 + vim/bundle/vim-go | 1 + vim/bundle/vim-mkdir | 1 + vim/bundle/vim-rails | 1 + vim/bundle/vim-rspec | 1 + vim/bundle/vim-ruby | 1 + vim/bundle/vim-run-interactive | 1 + vim/bundle/vim-slim | 1 + vim/bundle/vim-surround | 1 + vim/colors/github.vim | 115 ++++++++++++++++++++++++ vim/colors/monokai.vim | 108 +++++++++++++++++++++++ vimrc | 155 +++++++++++++++++++++++++++++++++ vimrc.bundles | 38 ++++++++ vimrc.bundles.local | 1 + vimrc.local | 3 + zshrc | 8 ++ zshrc.local | 19 ++++ 33 files changed, 504 insertions(+) create mode 100644 README.md create mode 100644 bash_aliases create mode 100644 vim/.netrwhist create mode 160000 vim/bundle/Vundle.vim create mode 160000 vim/bundle/ctags.vim create mode 160000 vim/bundle/ctrlp.vim create mode 160000 vim/bundle/dash.vim create mode 160000 vim/bundle/matchit.zip create mode 160000 vim/bundle/rename.vim create mode 160000 vim/bundle/syntastic create mode 160000 vim/bundle/tComment create mode 160000 vim/bundle/vim-airline create mode 160000 vim/bundle/vim-bundler create mode 160000 vim/bundle/vim-coffee-script create mode 160000 vim/bundle/vim-colors-github create mode 160000 vim/bundle/vim-endwise create mode 160000 vim/bundle/vim-fugitive create mode 160000 vim/bundle/vim-go create mode 160000 vim/bundle/vim-mkdir create mode 160000 vim/bundle/vim-rails create mode 160000 vim/bundle/vim-rspec create mode 160000 vim/bundle/vim-ruby create mode 160000 vim/bundle/vim-run-interactive create mode 160000 vim/bundle/vim-slim create mode 160000 vim/bundle/vim-surround create mode 100644 vim/colors/github.vim create mode 100644 vim/colors/monokai.vim create mode 100644 vimrc create mode 100644 vimrc.bundles create mode 100644 vimrc.bundles.local create mode 100644 vimrc.local create mode 100644 zshrc create mode 100644 zshrc.local diff --git a/README.md b/README.md new file mode 100644 index 0000000..e23e90b --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# How To + +Clone the repository, then symlink `ln -s` each file to the dotted version in your homedirectory. +ex: +```ln -s dotfiles/zshrc ~/.zshrc``` diff --git a/bash_aliases b/bash_aliases new file mode 100644 index 0000000..197b334 --- /dev/null +++ b/bash_aliases @@ -0,0 +1,20 @@ +alias nginx.start='sudo launchctl load /Library/LaunchDaemons/homebrew.mxcl.nginx.plist' +alias nginx.stop='sudo launchctl unload /Library/LaunchDaemons/homebrew.mxcl.nginx.plist' +alias nginx.restart='nginx.stop && nginx.start' +alias php-fpm.start="launchctl load -w ~/Library/LaunchAgents/homebrew.mxcl.php56.plist" +alias php-fpm.stop="launchctl unload -w ~/Library/LaunchAgents/homebrew.mxcl.php56.plist" +alias php-fpm.restart='php-fpm.stop && php-fpm.start' +alias mysql.start="launchctl load -w ~/Library/LaunchAgents/homebrew.mxcl.mysql.plist" +alias mysql.stop="launchctl unload -w ~/Library/LaunchAgents/homebrew.mxcl.mysql.plist" +alias mysql.restart='mysql.stop && mysql.start' +alias nginx.logs.error='tail -250f /usr/local/etc/nginx/logs/error.log' +alias nginx.logs.access='tail -250f /usr/local/etc/nginx/logs/access.log' +alias nginx.logs.default.access='tail -250f /usr/local/etc/nginx/logs/default.access.log' +alias nginx.logs.default-ssl.access='tail -250f /usr/local/etc/nginx/logs/default-ssl.access.log' +alias nginx.logs.phpmyadmin.error='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.error.log' +alias nginx.logs.phpmyadmin.access='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.access.log' +alias bower='noglob bower' +alias rm=/bin/rm -i +alias ip="ifconfig | pcregrep -M -o '^[^\t:]+:([^\n]|\n\t)*status: active'" +function gi() { curl -L -s https://www.gitignore.io/api/$@ ;} +function glate(){git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname) %(committerdate) %(authorname)' | sed 's/refs\/heads\///g';} diff --git a/vim/.netrwhist b/vim/.netrwhist new file mode 100644 index 0000000..ee96c49 --- /dev/null +++ b/vim/.netrwhist @@ -0,0 +1,10 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhist_cnt =8 +let g:netrw_dirhist_1='/Library/StartupItems/SpoofMAC' +let g:netrw_dirhist_2='/Users/tsouza' +let g:netrw_dirhist_3='/Users/tsouza/RubymineProjects/roadmap/.git' +let g:netrw_dirhist_4='/Users/tsouza/.ssh' +let g:netrw_dirhist_5='/Users/tsouza/code/sshui' +let g:netrw_dirhist_6='/Users/tsouza/.oh-my-zsh' +let g:netrw_dirhist_7='/Users/tsouza/PycharmProjects/addgene-core' +let g:netrw_dirhist_8='/Users/tsouza/.ssh' diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim new file mode 160000 index 0000000..0b28e33 --- /dev/null +++ b/vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit 0b28e334e65b6628b0a61c412fcb45204a2f2bab diff --git a/vim/bundle/ctags.vim b/vim/bundle/ctags.vim new file mode 160000 index 0000000..a438a4f --- /dev/null +++ b/vim/bundle/ctags.vim @@ -0,0 +1 @@ +Subproject commit a438a4f580c9445744c25941185c8cb8fb6b79b9 diff --git a/vim/bundle/ctrlp.vim b/vim/bundle/ctrlp.vim new file mode 160000 index 0000000..b5d3fe6 --- /dev/null +++ b/vim/bundle/ctrlp.vim @@ -0,0 +1 @@ +Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/vim/bundle/dash.vim b/vim/bundle/dash.vim new file mode 160000 index 0000000..8dc25d5 --- /dev/null +++ b/vim/bundle/dash.vim @@ -0,0 +1 @@ +Subproject commit 8dc25d544d567a86e00a97df1afe92caad3dfbfb diff --git a/vim/bundle/matchit.zip b/vim/bundle/matchit.zip new file mode 160000 index 0000000..ced6c40 --- /dev/null +++ b/vim/bundle/matchit.zip @@ -0,0 +1 @@ +Subproject commit ced6c409c9beeb0b4142d21906606bd194411d1d diff --git a/vim/bundle/rename.vim b/vim/bundle/rename.vim new file mode 160000 index 0000000..f133763 --- /dev/null +++ b/vim/bundle/rename.vim @@ -0,0 +1 @@ +Subproject commit f133763b0bbd79039f4e071a467ea8fc27d97dbd diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic new file mode 160000 index 0000000..e62fe0e --- /dev/null +++ b/vim/bundle/syntastic @@ -0,0 +1 @@ +Subproject commit e62fe0e6ede2917e96a6b8b834468028924ecc64 diff --git a/vim/bundle/tComment b/vim/bundle/tComment new file mode 160000 index 0000000..fb23d1b --- /dev/null +++ b/vim/bundle/tComment @@ -0,0 +1 @@ +Subproject commit fb23d1b8b7c54be19436fdba87de425c73d19a2a diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline new file mode 160000 index 0000000..f0e0062 --- /dev/null +++ b/vim/bundle/vim-airline @@ -0,0 +1 @@ +Subproject commit f0e00620c07e0379595df7ef4efd4a67f7bfb384 diff --git a/vim/bundle/vim-bundler b/vim/bundle/vim-bundler new file mode 160000 index 0000000..37096db --- /dev/null +++ b/vim/bundle/vim-bundler @@ -0,0 +1 @@ +Subproject commit 37096dbdcb84d89b17e6706f3e4e84da3c2a2990 diff --git a/vim/bundle/vim-coffee-script b/vim/bundle/vim-coffee-script new file mode 160000 index 0000000..18c6852 --- /dev/null +++ b/vim/bundle/vim-coffee-script @@ -0,0 +1 @@ +Subproject commit 18c68524ab8a043a566bbe227ea8f81ab922d092 diff --git a/vim/bundle/vim-colors-github b/vim/bundle/vim-colors-github new file mode 160000 index 0000000..e5bc567 --- /dev/null +++ b/vim/bundle/vim-colors-github @@ -0,0 +1 @@ +Subproject commit e5bc5678c8509cdc99541dcc585e65bcc2f79f19 diff --git a/vim/bundle/vim-endwise b/vim/bundle/vim-endwise new file mode 160000 index 0000000..ab5f7f9 --- /dev/null +++ b/vim/bundle/vim-endwise @@ -0,0 +1 @@ +Subproject commit ab5f7f99f49ee26a16563df00a79fbc3bf1090af diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive new file mode 160000 index 0000000..90ee6fb --- /dev/null +++ b/vim/bundle/vim-fugitive @@ -0,0 +1 @@ +Subproject commit 90ee6fb5d255d14d9f12f2469f92ee50149f5b44 diff --git a/vim/bundle/vim-go b/vim/bundle/vim-go new file mode 160000 index 0000000..26e4832 --- /dev/null +++ b/vim/bundle/vim-go @@ -0,0 +1 @@ +Subproject commit 26e4832155b4a8bcdcab4fbc0cf357a58c463390 diff --git a/vim/bundle/vim-mkdir b/vim/bundle/vim-mkdir new file mode 160000 index 0000000..549dcb4 --- /dev/null +++ b/vim/bundle/vim-mkdir @@ -0,0 +1 @@ +Subproject commit 549dcb4b6802c213fd7c4f0b4d76022c9875b786 diff --git a/vim/bundle/vim-rails b/vim/bundle/vim-rails new file mode 160000 index 0000000..1b0408b --- /dev/null +++ b/vim/bundle/vim-rails @@ -0,0 +1 @@ +Subproject commit 1b0408b07bf72587460b6423981b684d49bb220c diff --git a/vim/bundle/vim-rspec b/vim/bundle/vim-rspec new file mode 160000 index 0000000..30b2ceb --- /dev/null +++ b/vim/bundle/vim-rspec @@ -0,0 +1 @@ +Subproject commit 30b2ceb2d2628d1c9a55246179be4a0b63fdbe54 diff --git a/vim/bundle/vim-ruby b/vim/bundle/vim-ruby new file mode 160000 index 0000000..5bc55be --- /dev/null +++ b/vim/bundle/vim-ruby @@ -0,0 +1 @@ +Subproject commit 5bc55bec639836ff5c35f58dc62988d6d1e74bd9 diff --git a/vim/bundle/vim-run-interactive b/vim/bundle/vim-run-interactive new file mode 160000 index 0000000..060a9fc --- /dev/null +++ b/vim/bundle/vim-run-interactive @@ -0,0 +1 @@ +Subproject commit 060a9fcb69f1da0824fcfe6d4055597abad8fc2e diff --git a/vim/bundle/vim-slim b/vim/bundle/vim-slim new file mode 160000 index 0000000..0daaa85 --- /dev/null +++ b/vim/bundle/vim-slim @@ -0,0 +1 @@ +Subproject commit 0daaa8581f9a9968cebbc7d14ae9acf1625c0389 diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround new file mode 160000 index 0000000..fa433e0 --- /dev/null +++ b/vim/bundle/vim-surround @@ -0,0 +1 @@ +Subproject commit fa433e0b7330753688f715f3be5d10dc480f20e5 diff --git a/vim/colors/github.vim b/vim/colors/github.vim new file mode 100644 index 0000000..818632d --- /dev/null +++ b/vim/colors/github.vim @@ -0,0 +1,115 @@ +" Vim color file -- with 256 colour support! +" +" Author: Anthony Carapetis +" Contributors: Lucas Tadeu +" +" Note: Based on github's syntax highlighting theme +" Used Brian Mock's darkspectrum as a starting point/template +" Thanks to Ryan Heath for an easy list of some of the colours: +" http://rpheath.com/posts/356-github-theme-for-syntax-gem + +set background=light + +if version > 580 + hi clear + if exists("syntax_on") + syntax reset + endif +endif + +let colors_name = "github" + +" {{{ General colors +hi Normal ctermfg=0 ctermbg=255 guifg=#000000 guibg=#F8F8FF +hi Cursor ctermfg=239 ctermbg=15 guifg=#F8F8FF guibg=#444454 +hi Visual ctermfg=15 ctermbg=61 guifg=#FFFFFF guibg=#3465a3 +hi VisualNOS ctermfg=15 ctermbg=24 guifg=#FFFFFF guibg=#204a87 +hi Search ctermfg=236 ctermbg=228 guifg=#000000 guibg=#FFFF8C cterm=bold gui=bold +hi Folded ctermfg=8 ctermbg=15 guifg=#808080 guibg=#ECECEC gui=bold cterm=bold +hi Title ctermfg=167 guifg=#ef5939 +hi StatusLine ctermfg=238 ctermbg=250 guifg=#404040 guibg=#bbbbbb gui=bold cterm=bold +hi StatusLineNC ctermfg=238 ctermbg=252 guifg=#404040 guibg=#d4d4d4 gui=italic cterm=italic +hi VertSplit ctermfg=250 ctermbg=250 guifg=#bbbbbb guibg=#bbbbbb gui=none cterm=none +hi LineNr ctermfg=246 ctermbg=15 guifg=#959595 guibg=#ECECEC gui=bold cterm=bold +hi SpecialKey ctermfg=6 guifg=#177F80 gui=italic cterm=italic +hi WarningMsg ctermfg=167 guifg=#ef5939 +hi ErrorMsg ctermbg=15 ctermfg=196 guibg=#f8f8ff guifg=#ff1100 gui=undercurl cterm=undercurl +hi ColorColumn ctermbg=254 guibg=#e4e4e4 +" }}} + +" {{{ Vim => 7.0 specific colors +if version >= 700 + hi CursorLine ctermbg=253 guibg=#D8D8DD + hi MatchParen ctermfg=0 ctermbg=252 guifg=#000000 guibg=#cdcdfd + hi Pmenu ctermfg=15 ctermbg=8 guifg=#ffffff guibg=#808080 gui=bold cterm=bold + hi PmenuSel ctermfg=0 ctermbg=252 guifg=#000000 guibg=#cdcdfd gui=italic cterm=italic + hi PmenuSbar ctermfg=238 ctermbg=0 guifg=#444444 guibg=#000000 + hi PmenuThumb ctermfg=248 ctermbg=248 guifg=#aaaaaa guibg=#aaaaaa +endif +" }}} + +" {{{ Diff highlighting +hi DiffAdd ctermfg=233 ctermbg=194 guifg=#003300 guibg=#DDFFDD gui=none cterm=none +hi DiffChange ctermbg=255 guibg=#ececec gui=none cterm=none +hi DiffText ctermfg=233 ctermbg=189 guifg=#000033 guibg=#DDDDFF gui=none cterm=none +hi DiffDelete ctermfg=252 ctermbg=224 guifg=#DDCCCC guibg=#FFDDDD gui=none cterm=none +" }}} + +" {{{ Syntax highlighting +hi Ignore ctermfg=8 guifg=#808080 +hi Identifier ctermfg=31 guifg=#0086B3 +hi PreProc ctermfg=247 guifg=#A0A0A0 gui=bold cterm=bold +hi Comment ctermfg=246 guifg=#999988 +hi Constant ctermfg=6 guifg=#177F80 gui=none cterm=none +hi String ctermfg=161 guifg=#D81745 +hi Function ctermfg=88 guifg=#990000 gui=bold cterm=bold +hi Statement ctermfg=0 guifg=#000000 gui=bold cterm=bold +hi Type ctermfg=60 guifg=#445588 gui=bold cterm=bold +hi Number ctermfg=30 guifg=#1C9898 +hi Todo ctermfg=15 ctermbg=88 guifg=#FFFFFF guibg=#990000 gui=bold cterm=bold +hi Special ctermfg=28 guifg=#159828 gui=bold cterm=bold +hi Todo ctermbg=15 ctermfg=196 guibg=#f8f8ff guifg=#ff1100 gui=underline cterm=underline +hi Label ctermfg=0 guifg=#000000 gui=bold cterm=bold +hi StorageClass ctermfg=0 guifg=#000000 gui=bold cterm=bold +hi Structure ctermfg=0 guifg=#000000 gui=bold cterm=bold +hi TypeDef ctermfg=0 guifg=#000000 gui=bold cterm=bold + +" {{{ Links +hi! link FoldColumn Folded +hi! link CursorColumn CursorLine +hi! link NonText LineNr +" }}} + +" {{{ Aliases +hi link cppSTL Function +hi link cppSTLType Type +hi link Character Number +hi link htmlTag htmlEndTag +hi link htmlLink Underlined +hi link pythonFunction Identifier +hi link Question Type +hi link CursorIM Cursor +hi link VisualNOS Visual +hi link xmlTag Identifier +hi link xmlTagName Identifier +hi link shDeref Identifier +hi link shVariable Function +hi link rubySharpBang Special +hi link perlSharpBang Special +hi link schemeFunc Statement +" }}} + +" {{{ Tabs +hi TabLine ctermfg=238 ctermbg=188 guifg=#404040 guibg=#dddddd gui=none +hi TabLineFill ctermfg=238 ctermbg=188 guifg=#404040 guibg=#dddddd gui=none +hi TabLineSel ctermfg=238 guifg=#404040 gui=bold +" }}} + +" {{{ Spelling +if has("spell") + hi spellBad guisp=#fcaf3e + hi spellCap guisp=#73d216 + hi spellRare guisp=#fcaf3e + hi spellLocal guisp=#729fcf +endif +" }}} diff --git a/vim/colors/monokai.vim b/vim/colors/monokai.vim new file mode 100644 index 0000000..fa31009 --- /dev/null +++ b/vim/colors/monokai.vim @@ -0,0 +1,108 @@ +" Vim color file +" Converted from Textmate theme Monokai using Coloration v0.3.2 (http://github.com/sickill/coloration) + +set background=dark +highlight clear + +if exists("syntax_on") + syntax reset +endif + +set t_Co=256 +let g:colors_name = "monokai" + +hi Cursor ctermfg=235 ctermbg=231 cterm=NONE guifg=#272822 guibg=#f8f8f0 gui=NONE +hi Visual ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE +hi CursorLine ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE +hi CursorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE +hi ColorColumn ctermfg=NONE ctermbg=237 cterm=NONE guifg=NONE guibg=#3c3d37 gui=NONE +hi LineNr ctermfg=102 ctermbg=237 cterm=NONE guifg=#90908a guibg=#3c3d37 gui=NONE +hi VertSplit ctermfg=241 ctermbg=241 cterm=NONE guifg=#64645e guibg=#64645e gui=NONE +hi MatchParen ctermfg=197 ctermbg=NONE cterm=underline guifg=#f92672 guibg=NONE gui=underline +hi StatusLine ctermfg=231 ctermbg=241 cterm=bold guifg=#f8f8f2 guibg=#64645e gui=bold +hi StatusLineNC ctermfg=231 ctermbg=241 cterm=NONE guifg=#f8f8f2 guibg=#64645e gui=NONE +hi Pmenu ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi PmenuSel ctermfg=NONE ctermbg=59 cterm=NONE guifg=NONE guibg=#49483e gui=NONE +hi IncSearch ctermfg=235 ctermbg=186 cterm=NONE guifg=#272822 guibg=#e6db74 gui=NONE +hi Search ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline +hi Directory ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi Folded ctermfg=242 ctermbg=235 cterm=NONE guifg=#75715e guibg=#272822 gui=NONE + +hi Normal ctermfg=231 ctermbg=235 cterm=NONE guifg=#f8f8f2 guibg=#272822 gui=NONE +hi Boolean ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi Character ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi Comment ctermfg=242 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE +hi Conditional ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi Constant ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi Define ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi DiffAdd ctermfg=231 ctermbg=64 cterm=bold guifg=#f8f8f2 guibg=#46830c gui=bold +hi DiffDelete ctermfg=88 ctermbg=NONE cterm=NONE guifg=#8b0807 guibg=NONE gui=NONE +hi DiffChange ctermfg=231 ctermbg=23 cterm=NONE guifg=#f8f8f2 guibg=#243955 gui=NONE +hi DiffText ctermfg=231 ctermbg=24 cterm=bold guifg=#f8f8f2 guibg=#204a87 gui=bold +hi ErrorMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE +hi WarningMsg ctermfg=231 ctermbg=197 cterm=NONE guifg=#f8f8f0 guibg=#f92672 gui=NONE +hi Float ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi Function ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE +hi Identifier ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic +hi Keyword ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi Label ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE +hi NonText ctermfg=59 ctermbg=236 cterm=NONE guifg=#49483e guibg=#31322c gui=NONE +hi Number ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi Operator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi PreProc ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi Special ctermfg=231 ctermbg=NONE cterm=NONE guifg=#f8f8f2 guibg=NONE gui=NONE +hi SpecialKey ctermfg=59 ctermbg=237 cterm=NONE guifg=#49483e guibg=#3c3d37 gui=NONE +hi Statement ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi StorageClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic +hi String ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE +hi Tag ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi Title ctermfg=231 ctermbg=NONE cterm=bold guifg=#f8f8f2 guibg=NONE gui=bold +hi Todo ctermfg=95 ctermbg=NONE cterm=inverse,bold guifg=#75715e guibg=NONE gui=inverse,bold +hi Type ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi Underlined ctermfg=NONE ctermbg=NONE cterm=underline guifg=NONE guibg=NONE gui=underline +hi rubyClass ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi rubyFunction ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE +hi rubyInterpolationDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi rubySymbol ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi rubyConstant ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic +hi rubyStringDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE +hi rubyBlockParameter ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic +hi rubyInstanceVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi rubyInclude ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi rubyGlobalVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi rubyRegexp ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE +hi rubyRegexpDelimiter ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE +hi rubyEscape ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi rubyControl ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi rubyClassVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi rubyOperator ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi rubyException ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi rubyPseudoVariable ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi rubyRailsUserClass ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic +hi rubyRailsARAssociationMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE +hi rubyRailsARMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE +hi rubyRailsRenderMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE +hi rubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE +hi erubyDelimiter ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi erubyComment ctermfg=95 ctermbg=NONE cterm=NONE guifg=#75715e guibg=NONE gui=NONE +hi erubyRailsMethod ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE +hi htmlTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi htmlEndTag ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi htmlTagName ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi htmlArg ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi htmlSpecialChar ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi javaScriptFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=italic +hi javaScriptRailsFunction ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE +hi javaScriptBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi yamlKey ctermfg=197 ctermbg=NONE cterm=NONE guifg=#f92672 guibg=NONE gui=NONE +hi yamlAnchor ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi yamlAlias ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE +hi yamlDocumentHeader ctermfg=186 ctermbg=NONE cterm=NONE guifg=#e6db74 guibg=NONE gui=NONE +hi cssURL ctermfg=208 ctermbg=NONE cterm=NONE guifg=#fd971f guibg=NONE gui=italic +hi cssFunctionName ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE +hi cssColor ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi cssPseudoClassId ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE +hi cssClassName ctermfg=148 ctermbg=NONE cterm=NONE guifg=#a6e22e guibg=NONE gui=NONE +hi cssValueLength ctermfg=141 ctermbg=NONE cterm=NONE guifg=#ae81ff guibg=NONE gui=NONE +hi cssCommonAttr ctermfg=81 ctermbg=NONE cterm=NONE guifg=#66d9ef guibg=NONE gui=NONE +hi cssBraces ctermfg=NONE ctermbg=NONE cterm=NONE guifg=NONE guibg=NONE gui=NONE diff --git a/vimrc b/vimrc new file mode 100644 index 0000000..a7994ff --- /dev/null +++ b/vimrc @@ -0,0 +1,155 @@ +" Use Vim settings, rather then Vi settings. This setting must be as early as +" possible, as it has side effects. +set nocompatible + +" Leader +let mapleader = " " + +set backspace=2 " Backspace deletes like most programs in insert mode +set nobackup +set nowritebackup +set noswapfile " http://robots.thoughtbot.com/post/18739402579/global-gitignore#comment-458413287 +set history=50 +set ruler " show the cursor position all the time +set showcmd " display incomplete commands +set incsearch " do incremental searching +set laststatus=2 " Always display the status line +set autowrite " Automatically :write before running commands + +" Switch syntax highlighting on, when the terminal has colors +" Also switch on highlighting the last used search pattern. +if (&t_Co > 2 || has("gui_running")) && !exists("syntax_on") + syntax on +endif + +if filereadable(expand("~/.vimrc.bundles")) + source ~/.vimrc.bundles +endif + +filetype plugin indent on + +augroup vimrcEx + autocmd! + + " When editing a file, always jump to the last known cursor position. + " Don't do it for commit messages, when the position is invalid, or when + " inside an event handler (happens when dropping a file on gvim). + autocmd BufReadPost * + \ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") | + \ exe "normal g`\"" | + \ endif + + " Cucumber navigation commands + autocmd User Rails Rnavcommand step features/step_definitions -glob=**/* -suffix=_steps.rb + autocmd User Rails Rnavcommand config config -glob=**/* -suffix=.rb -default=routes + + " Set syntax highlighting for specific file types + autocmd BufRead,BufNewFile Appraisals set filetype=ruby + autocmd BufRead,BufNewFile *.md set filetype=markdown + + " Enable spellchecking for Markdown + autocmd FileType markdown setlocal spell + + " Automatically wrap at 80 characters for Markdown + autocmd BufRead,BufNewFile *.md setlocal textwidth=80 + + " Allow stylesheets to autocomplete hyphenated words + autocmd FileType css,scss,sass setlocal iskeyword+=- +augroup END + +" Softtabs, 2 spaces +set tabstop=2 +set shiftwidth=2 +set shiftround +set expandtab + + +" Use The Silver Searcher https://github.com/ggreer/the_silver_searcher +if executable('ag') + " Use Ag over Grep + set grepprg=ag\ --nogroup\ --nocolor + + " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore + let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""' + + " ag is fast enough that CtrlP doesn't need to cache + let g:ctrlp_use_caching = 0 +endif + +" Color scheme +colorscheme github +highlight NonText guibg=#060606 +highlight Folded guibg=#0A0A0A guifg=#9090D0 + +" Make it obvious where 80 characters is +set textwidth=80 +set colorcolumn=+1 + +" Numbers +set number +set numberwidth=5 + +" Tab completion +" will insert tab at beginning of line, +" will use completion if not at beginning +set wildmode=list:longest,list:full +function! InsertTabWrapper() + let col = col('.') - 1 + if !col || getline('.')[col - 1] !~ '\k' + return "\" + else + return "\" + endif +endfunction +inoremap =InsertTabWrapper() +inoremap + +" Exclude Javascript files in :Rtags via rails.vim due to warnings when parsing +let g:Tlist_Ctags_Cmd="ctags --exclude='*.js'" + +" Index ctags from any project, including those outside Rails +map ct :!ctags -R . + +" Switch between the last two files +nnoremap + +" Get off my lawn +nnoremap :echoe "Use h" +nnoremap :echoe "Use l" +nnoremap :echoe "Use k" +nnoremap :echoe "Use j" + +" vim-rspec mappings +nnoremap t :call RunCurrentSpecFile() +nnoremap s :call RunNearestSpec() +nnoremap l :call RunLastSpec() + +" Run commands that require an interactive shell +nnoremap r :RunInInteractiveShell + +" Treat
  • and

    tags like the block tags they are +let g:html_indent_tags = 'li\|p' + +" Open new split panes to right and bottom, which feels more natural +set splitbelow +set splitright + +" Quicker window movement +nnoremap j +nnoremap k +nnoremap h +nnoremap l + +" configure syntastic syntax checking to check on open as well as save +let g:syntastic_check_on_open=1 +let g:syntastic_html_tidy_ignore_errors=[" proprietary attribute \"ng-"] + +" Set spellfile to location that is guaranteed to exist, can be symlinked to +" Dropbox or kept in Git and managed outside of thoughtbot/dotfiles using rcm. +set spellfile=$HOME/.vim-spell-en.utf-8.add + +" Local config +if filereadable($HOME . "/.vimrc.local") + source ~/.vimrc.local +endif +colorscheme monokai diff --git a/vimrc.bundles b/vimrc.bundles new file mode 100644 index 0000000..15cea17 --- /dev/null +++ b/vimrc.bundles @@ -0,0 +1,38 @@ +if &compatible + set nocompatible +end + +filetype off +set rtp+=~/.vim/bundle/Vundle.vim/ +call vundle#begin() + +" Let Vundle manage Vundle +Plugin 'gmarik/Vundle.vim' + +" Define bundles via Github repos +Plugin 'christoomey/vim-run-interactive' +Plugin 'croaky/vim-colors-github' +Plugin 'danro/rename.vim' +Plugin 'kchmck/vim-coffee-script' +Plugin 'kien/ctrlp.vim' +Plugin 'pbrisbin/vim-mkdir' +Plugin 'scrooloose/syntastic' +Plugin 'slim-template/vim-slim' +Plugin 'thoughtbot/vim-rspec' +Plugin 'tpope/vim-bundler' +Plugin 'tpope/vim-endwise' +Plugin 'tpope/vim-fugitive' +Plugin 'tpope/vim-rails' +Plugin 'tpope/vim-surround' +Plugin 'vim-ruby/vim-ruby' +Plugin 'vim-scripts/ctags.vim' +Plugin 'vim-scripts/matchit.zip' +Plugin 'vim-scripts/tComment' +Plugin 'bling/vim-airline' + +if filereadable(expand("~/.vimrc.bundles.local")) + source ~/.vimrc.bundles.local +endif + +call vundle#end() +filetype on diff --git a/vimrc.bundles.local b/vimrc.bundles.local new file mode 100644 index 0000000..62597e1 --- /dev/null +++ b/vimrc.bundles.local @@ -0,0 +1 @@ +Plugin 'rizzatti/dash.vim' diff --git a/vimrc.local b/vimrc.local new file mode 100644 index 0000000..39d942c --- /dev/null +++ b/vimrc.local @@ -0,0 +1,3 @@ +colorscheme monokai +let g:airline_powerline_fonts = 1 +set paste diff --git a/zshrc b/zshrc new file mode 100644 index 0000000..f9788b9 --- /dev/null +++ b/zshrc @@ -0,0 +1,8 @@ +# Path to your oh-my-zsh installation. +export ZSH=$HOME/.oh-my-zsh +ZSH_THEME="half-life" +plugins=(git) +source $ZSH/oh-my-zsh.sh + +# Local changes +source $HOME/.zshrc.local diff --git a/zshrc.local b/zshrc.local new file mode 100644 index 0000000..36bdb33 --- /dev/null +++ b/zshrc.local @@ -0,0 +1,19 @@ +# User configuration Exports +export NPM_PACKAGES="${HOME}/.npm-packages" +export NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH" +export GOPATH=$HOME/go +export PHP_AUTOCONF="/usr/local/bin/autoconf" +export WORKON_HOME=$HOME/.virtualenvs +export PROJECT_HOME=$HOME/Devel + +# Path +export PATH="$HOME/bin:$HOME/.rvm.bin:$NPM_PACKAGES/bin:$GOPATH/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH" + +# Sourcing aliases and functions +source /usr/local/bin/virtualenvwrapper_lazy.sh +source ~/.bash_aliases + +# Unset manpath so we can inherit from /etc/manpath via the `manpath` +# command +unset MANPATH # delete if you already modified MANPATH elsewhere in your config +MANPATH="$NPM_PACKAGES/share/man:$(manpath)"