From: Ben Beltran Date: Mon, 3 Jun 2013 12:24:52 +0000 (-0500) Subject: Update stuffs X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/551714b73376655c1871b003b57b9a647208bc82 Update stuffs --- diff --git a/vim/.netrwhist b/vim/.netrwhist index 03884d9..115134c 100644 --- a/vim/.netrwhist +++ b/vim/.netrwhist @@ -1,6 +1,8 @@ let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =4 +let g:netrw_dirhist_cnt =6 let g:netrw_dirhist_1='/Users/benbeltran/.newsbeuter' let g:netrw_dirhist_2='/Users/benbeltran/.vim' let g:netrw_dirhist_3='/Users/benbeltran/.dotfiles/tmux-powerline' let g:netrw_dirhist_4='/Users/benbeltran/.config' +let g:netrw_dirhist_5='/Users/benbeltran/Projects/nitrogen/GantNitrogenIntegrationDependencies.oplx' +let g:netrw_dirhist_6='/private/etc/postfix' diff --git a/vim/colors/molokai.vim b/vim/colors/molokai.vim index aae9420..d809d1b 100644 --- a/vim/colors/molokai.vim +++ b/vim/colors/molokai.vim @@ -1,3 +1,4 @@ + " Vim color file " " Author: Tomas Restrepo @@ -75,12 +76,11 @@ hi PreProc guifg=#A6E22E hi Question guifg=#66D9EF hi Repeat guifg=#F92672 gui=bold hi Search guifg=#FFFFFF guibg=#455354 -" marks column +" marks hi SignColumn guifg=#A6E22E guibg=#232526 hi SpecialChar guifg=#F92672 gui=bold -hi SpecialComment guifg=#465457 gui=bold +hi SpecialComment guifg=#7E8E91 gui=bold hi Special guifg=#66D9EF guibg=bg gui=italic -hi SpecialKey guifg=#888A85 gui=italic if has("spell") hi SpellBad guisp=#FF0000 gui=undercurl hi SpellCap guisp=#7070F0 gui=undercurl @@ -111,21 +111,32 @@ if s:molokai_original == 1 hi Comment guifg=#75715E hi CursorLine guibg=#3E3D32 hi CursorColumn guibg=#3E3D32 + hi ColorColumn guibg=#3B3A32 hi LineNr guifg=#BCBCBC guibg=#3B3A32 - hi NonText guifg=#BCBCBC guibg=#3B3A32 + hi NonText guifg=#75715E + hi SpecialKey guifg=#75715E else hi Normal guifg=#F8F8F2 guibg=#1B1D1E - hi Comment guifg=#465457 + hi Comment guifg=#7E8E91 hi CursorLine guibg=#293739 hi CursorColumn guibg=#293739 - hi LineNr guifg=#BCBCBC guibg=#232526 - hi NonText guifg=#BCBCBC guibg=#232526 + hi ColorColumn guibg=#232526 + hi LineNr guifg=#465457 guibg=#232526 + hi NonText guifg=#465457 + hi SpecialKey guifg=#465457 end " " Support for 256-color terminal " if &t_Co > 255 + if s:molokai_original == 1 + hi Normal ctermbg=234 + hi CursorLine ctermbg=235 cterm=none + else + hi Normal ctermfg=252 + hi CursorLine ctermbg=234 cterm=none + endif hi Boolean ctermfg=135 hi Character ctermfg=144 hi Number ctermfg=135 @@ -150,11 +161,11 @@ if &t_Co > 255 hi FoldColumn ctermfg=67 ctermbg=16 hi Folded ctermfg=67 ctermbg=16 hi Function ctermfg=118 - hi Identifier ctermfg=208 + hi Identifier ctermfg=208 cterm=none hi Ignore ctermfg=244 ctermbg=232 hi IncSearch ctermfg=193 ctermbg=16 - hi Keyword ctermfg=161 cterm=bold + hi keyword ctermfg=161 cterm=bold hi Label ctermfg=229 cterm=none hi Macro ctermfg=193 hi SpecialKey ctermfg=81 @@ -180,9 +191,13 @@ if &t_Co > 255 hi SignColumn ctermfg=118 ctermbg=235 hi SpecialChar ctermfg=161 cterm=bold hi SpecialComment ctermfg=245 cterm=bold - hi Special ctermfg=81 ctermbg=232 - hi SpecialKey ctermfg=245 - + hi Special ctermfg=81 + if has("spell") + hi SpellBad ctermbg=52 + hi SpellCap ctermbg=17 + hi SpellLocal ctermbg=17 + hi SpellRare ctermfg=none ctermbg=none cterm=reverse + endif hi Statement ctermfg=161 cterm=bold hi StatusLine ctermfg=238 ctermbg=253 hi StatusLineNC ctermfg=244 ctermbg=232 @@ -197,15 +212,54 @@ if &t_Co > 255 hi Underlined ctermfg=244 cterm=underline hi VertSplit ctermfg=244 ctermbg=232 cterm=bold - hi VisualNOS ctermbg=238 - hi Visual ctermbg=235 + hi VisualNOS ctermbg=240 + hi Visual ctermbg=238 hi WarningMsg ctermfg=231 ctermbg=238 cterm=bold hi WildMenu ctermfg=81 ctermbg=16 - hi Normal ctermfg=252 ctermbg=233 hi Comment ctermfg=59 - hi CursorLine ctermbg=234 cterm=none hi CursorColumn ctermbg=234 + hi ColorColumn ctermbg=234 hi LineNr ctermfg=250 ctermbg=234 - hi NonText ctermfg=250 ctermbg=234 + hi NonText ctermfg=59 + + hi SpecialKey ctermfg=59 + + if exists("g:rehash256") && g:rehash256 == 1 + hi Normal ctermfg=252 ctermbg=234 + hi CursorLine ctermbg=236 cterm=none + hi CursorLineNr ctermfg=226 + + hi Boolean ctermfg=141 + hi Character ctermfg=222 + hi Number ctermfg=141 + hi String ctermfg=222 + hi Conditional ctermfg=197 cterm=bold + hi Constant ctermfg=141 cterm=bold + + hi DiffDelete ctermfg=125 ctermbg=233 + + hi Directory ctermfg=154 cterm=bold + hi Error ctermfg=125 ctermbg=233 + hi Exception ctermfg=154 cterm=bold + hi Float ctermfg=141 + hi Function ctermfg=154 + hi Identifier ctermfg=208 + + hi Keyword ctermfg=197 cterm=bold + hi Operator ctermfg=197 + hi PreCondit ctermfg=154 cterm=bold + hi PreProc ctermfg=154 + hi Repeat ctermfg=197 cterm=bold + + hi Statement ctermfg=197 cterm=bold + hi Tag ctermfg=197 + hi Title ctermfg=203 + hi Visual ctermbg=238 + + hi Comment ctermfg=244 + hi LineNr ctermfg=239 ctermbg=235 + hi NonText ctermfg=239 + hi SpecialKey ctermfg=239 + endif end diff --git a/vimrc b/vimrc index 1f5dea3..e564874 100755 --- a/vimrc +++ b/vimrc @@ -121,7 +121,7 @@ set modelines=10 " Default color scheme set t_Co=256 -color railscasts +color molokai " Directories for swp files set backupdir=~/.vim/.backup @@ -166,3 +166,4 @@ set rtp+=~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/vim " Fix CtrlP root folder and add some ignores let g:ctrlp_working_path_mode = 0 let g:ctrlp_custom_ignore = '\v[\/](\.(git|hg|svn)|node_modules|DS_Store)$' +let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files'] diff --git a/zshrc b/zshrc index 59f79a1..d68d3dc 100644 --- a/zshrc +++ b/zshrc @@ -34,7 +34,7 @@ source $ZSH/oh-my-zsh.sh export TERM=screen-256color export JAVA_HOME=$(/usr/libexec/java_home) -export PATH=/usr/local/bin:/usr/local/sbin:$PATH +export PATH=/Users/benbeltran/Projects/nitrogen/bin:/usr/local/bin:/usr/local/sbin:$PATH export NODE_PATH=/usr/local/lib/node_modules:$NODE_PATH export PYTONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH export PS1="$PS1"'$([ -n "$TMUX" ] && tmux setenv TMUXPWD_$(tmux display -p "#I_#P") "$PWD")' @@ -52,6 +52,7 @@ echo -e "\033[m" alias dwarffortress="/Applications/Dwarf\ Fortress/df" alias ls="ls -FG" alias rspec="rspec --color" +alias nitro="server.js" #Screeninator and RVM scripts [[ -s $HOME/.rvm/scripts/rvm ]] && source $HOME/.rvm/scripts/rvm