Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Clean up vimrc.
  • Loading branch information
bnadlerjr committed Nov 8, 2011
1 parent 55a1123 commit 6c6b57e
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 142 deletions.
9 changes: 9 additions & 0 deletions bash/aliases
Expand Up @@ -11,6 +11,11 @@ alias cdd="cd -"
alias df="df -h"
alias t="tree -C"

# Download Ruby template from gist
function get-gist {
curl https://raw.github.com/gist/1326310/$1
}

# Create directory, then enter it
mkcd () {
mkdir -p "$*"
Expand All @@ -26,6 +31,10 @@ function pk {
alias r="time ./bin/rake"
alias gemi="gem install --no-rdoc --no-ri"

function testf {
time ruby -Itest $1
}

# Bundler
alias bi="bundle install"
alias bib="bundle install --binstubs"
Expand Down
2 changes: 0 additions & 2 deletions gvimrc
Expand Up @@ -10,5 +10,3 @@ if has("win32")
else
set guifont=Monaco:h13
endif

colorscheme jellybeans
209 changes: 78 additions & 131 deletions vim/after/colors/github.vim
@@ -1,139 +1,86 @@
" Vim color file
"
" Author: Anthony Carapetis <anthony.carapetis@gmail.com>
"
" 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
" Github.com colorscheme for vim
" Maintainer: Sean Caetano Martin @xonecas
" BETA

set background=light
hi clear

set background=light
if version > 580
" no guarantees for version 5.8 and below, but this makes it stop
" complaining
hi clear
if exists("syntax_on")
syntax reset
endif
if exists("syntax_on")
syntax reset
endif
let g:colors_name="github"

hi Normal guifg=#000000 guibg=#F8F8FF

" {{{ Cursor
hi Cursor guibg=#444454 guifg=#F8F8FF
hi CursorLine guibg=#D8D8DD
hi CursorColumn guibg=#E8E8EE
" }}}

" {{{ Diff
hi DiffAdd guifg=#003300 guibg=#DDFFDD gui=none
hi DiffChange guibg=#ececec gui=none
hi DiffText guifg=#000033 guibg=#DDDDFF gui=none
hi DiffDelete guifg=#DDCCCC guibg=#FFDDDD gui=none
" }}}

" {{{ Folding / Line Numbering / Status Lines
hi Folded guibg=#ECECEC guifg=#808080 gui=bold
hi vimFold guibg=#ECECEC guifg=#808080 gui=bold
hi FoldColumn guibg=#ECECEC guifg=#808080 gui=bold

hi LineNr guifg=#959595 guibg=#ECECEC gui=bold
hi NonText guifg=#808080 guibg=#ECECEC
hi Folded guifg=#808080 guibg=#ECECEC gui=bold
hi FoldeColumn guifg=#808080 guibg=#ECECEC gui=bold

hi VertSplit guibg=#bbbbbb guifg=#bbbbbb gui=none
hi StatusLine guibg=#bbbbbb guifg=#404040 gui=bold
hi StatusLineNC guibg=#d4d4d4 guifg=#404040 gui=italic
" }}}

" {{{ Misc
hi ModeMsg guifg=#990000
hi MoreMsg guifg=#990000

hi Title guifg=#ef5939
hi WarningMsg guifg=#ef5939
hi SpecialKey guifg=#177F80 gui=italic

hi MatchParen guibg=#cdcdfd guifg=#000000
hi Underlined guifg=#000000 gui=underline
hi Directory guifg=#990000
" }}}

" {{{ Search, Visual, etc
hi Visual guifg=#FFFFFF guibg=#3465a4 gui=none
hi VisualNOS guifg=#FFFFFF guibg=#204a87 gui=none
hi IncSearch guibg=#cdcdfd guifg=#000000 gui=italic
hi Search guibg=#cdcdfd guifg=#000000 gui=italic
" }}}

" {{{ Syntax groups
hi Ignore guifg=#808080
hi Identifier guifg=#0086B3
hi PreProc guifg=#A0A0A0 gui=bold
hi Comment guifg=#999988
hi Constant guifg=#177F80 gui=none
hi String guifg=#D81745
hi Function guifg=#990000 gui=bold
hi Statement guifg=#000000 gui=bold
hi Type guifg=#445588 gui=bold
hi Number guifg=#1C9898
hi Todo guifg=#FFFFFF guibg=#990000 gui=bold
hi Special guifg=#159828 gui=bold
hi rubySymbol guifg=#960B73
hi Error guibg=#f8f8ff guifg=#ff1100 gui=undercurl
hi Todo guibg=#f8f8ff guifg=#ff1100 gui=underline
hi Label guifg=#000000 gui=bold
hi StorageClass guifg=#000000 gui=bold
hi Structure guifg=#000000 gui=bold
hi TypeDef guifg=#000000 gui=bold
" }}}

" {{{ Completion menus
hi WildMenu guifg=#7fbdff guibg=#425c78 gui=none

hi Pmenu guibg=#808080 guifg=#ffffff gui=bold
hi PmenuSel guibg=#cdcdfd guifg=#000000 gui=italic
hi PmenuSbar guibg=#000000 guifg=#444444
hi PmenuThumb guibg=#aaaaaa guifg=#aaaaaa
" }}}
let colors_name="github"

hi Normal guifg=#000000 ctermfg=0 guibg=#FFFFFF ctermbg=15
hi Comment guifg=#999988 ctermfg=246 guibg=#FFFFFF ctermbg=15 gui=italic
hi String guifg=#DD1144 ctermfg=161
hi Boolean gui=bold cterm=bold
hi Number guifg=#009999 ctermfg=30
hi Identifier gui=bold cterm=bold
hi Function gui=bold cterm=bold
hi LineNr guifg=#666666 ctermfg=241 guibg=#ECECEC ctermbg=7

hi vimCommentTitle guifg=#999988 ctermfg=246 guibg=#FFFFFF ctermbg=15 gui=italic

hi javaScriptRegexpString guifg=#009926 ctermfg=28
hi javaScriptGlobal guifg=#000080 ctermfg=18
hi javaScriptNull guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi javaScriptOperator guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi javaScriptIdentifier guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi javaScriptType guifg=#0086B3 ctermfg=31
hi javaScriptConditional guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi javaScriptStatement guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi javaScriptRepeat guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi javaScriptNumber guifg=#009999 ctermfg=30

hi cssTagName guifg=#000080 ctermfg=18
hi cssDefinition guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssBoxProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssBoxAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssFontProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssTextProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssRenderProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssCommonAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssTextAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssRenderAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssGeneratedContentProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssPseudoClass guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssPseudoClassId guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssColorProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssColor guifg=#009999 ctermfg=30
hi cssFontAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssUIAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssUIProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssTableProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssTableAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssSelectorOp guifg=#000080 ctermfg=18
hi cssAttributeSelector guifg=#000080 ctermfg=18
hi cssGeneratedContentAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssSelectorOp2 guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssFontDescriptorProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssFontDescriptor guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssIdentifier guifg=#990000 ctermfg=88 gui=bold
hi cssMedia guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssMediaType guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssPagingProp guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssPagingAttr guifg=#000000 ctermfg=0 gui=bold cterm=bold
hi cssImportant guifg=#999999 ctermfg=246 gui=bold cterm=bold
hi cssUnicodeEscape guifg=#DD1144 ctermfg=161

hi htmlTag guifg=#000080 ctermfg=18
hi htmlTagN guifg=#000080 ctermfg=18
hi htmlTagName guifg=#000080 ctermfg=18
hi htmlEndTag guifg=#000080 ctermfg=18
hi htmlTitle guifg=#000000 ctermfg=0
hi htmlArg guifg=#009999 ctermfg=30
hi htmlSpecialTagName guifg=#000080 ctermfg=18
hi htmlLink guifg=#000000 ctermfg=0 gui=none cterm=none
hi htmlH1 guifg=#000000 ctermfg=0
hi htmlH2 guifg=#000000 ctermfg=0
hi htmlH3 guifg=#000000 ctermfg=0
hi htmlH4 guifg=#000000 ctermfg=0
hi htmlH5 guifg=#000000 ctermfg=0
hi htmlH6 guifg=#000000 ctermfg=0

" {{{ Spelling
hi spellBad guisp=#fcaf3e
hi spellCap guisp=#73d216
hi spellRare guisp=#fcaf3e
hi spellLocal guisp=#729fcf
" }}}

" {{{ Aliases
hi link cppSTL Function
hi link cppSTLType Type
hi link Character Number
hi link htmlTag htmlEndTag
"hi link htmlTagName htmlTag
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
"hi link shSpecialVariables Constant
"hi link bashSpecialVariables Constant
" }}}

" {{{ Tabs (non-gui0
hi TabLine guifg=#404040 guibg=#dddddd gui=none
hi TabLineFill guifg=#404040 guibg=#dddddd gui=none
hi TabLineSel guifg=#404040 gui=bold
" }}}
"
" vim: sw=4 ts=4 foldmethod=marker
2 changes: 2 additions & 0 deletions vim/snippets/ruby.snippets
Expand Up @@ -79,3 +79,5 @@ snippet shvpo
it { should validate_presence_of(${1:attr})${2} }
snippet shvuo
it { should validate_uniqueness_of(${1:attr})${2} }
snippet debugm
(${1:obj}.methods.sort - Object.methods).each { |m| p m }
13 changes: 4 additions & 9 deletions vimrc
Expand Up @@ -58,18 +58,10 @@ nnoremap <Leader>br :!bundle exec rake<CR>
" Map toggle comment function from NERDCommenter
nnoremap <Leader>c <space>
" Buffer Navigation Mappings
nnoremap <D-H> :bp<CR>
nnoremap <D-L> :bn<CR>
" Match bracket pairs using <tab>
nnoremap <tab> %
vnoremap <tab> %
" Open a new vertial window and switch over to it
nnoremap <leader>w <C-w>v<C-w>l
nnoremap <leader>wo <C-w>v<C-w>l :FufRenewCache<CR> :FufCoverageFile<CR>
" Make it easier to switch between windows
nnoremap <C-h> <C-w>h
nnoremap <C-j> <C-w>j
Expand Down Expand Up @@ -98,4 +90,7 @@ nnoremap <Right> <Esc>
au BufNewFile,BufReadPost *.coffee setl shiftwidth=2 expandtab

" Colors
colorscheme jellybeans
let g:solarized_termcolors=256
let g:solarized_visibility="high"
let g:solarized_contrast="high"
colorscheme topfunky-light

0 comments on commit 6c6b57e

Please sign in to comment.