Just some updates

This commit is contained in:
Josh Sherman 2015-03-20 11:50:40 -04:00
parent dcd2c8bd50
commit a6445a4f2e
7 changed files with 24 additions and 31 deletions

3
.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
vim/bundle
vim/.netrwhist

View file

@ -1,2 +1,7 @@
joshtronic dotfiles # Josh and the Amazing Technicolor Dotfiles
===================
My dotfiles bring all the nerds to the yard.
## Installation
Funny you should ask about that...

View file

@ -4,9 +4,9 @@ packages:
- Homebrew/homebrew-php - Homebrew/homebrew-php
- joshtronic/homebrew-formulae - joshtronic/homebrew-formulae
- bash - bash
- ghi
- git - git
- git-extras - git-extras
- gpg
- imagemagick - imagemagick
- likes - likes
- memcached - memcached

View file

@ -1,2 +1,3 @@
setlocal shiftwidth=4 setlocal shiftwidth=4
setlocal softtabstop=4
setlocal tabstop=4 setlocal tabstop=4

View file

@ -58,7 +58,7 @@ Bundle 'cakebaker/scss-syntax.vim'
Bundle 'ervandew/supertab' Bundle 'ervandew/supertab'
"Bundle 'garbas/vim-snipmate' "Bundle 'garbas/vim-snipmate'
Bundle 'groenewege/vim-less' Bundle 'groenewege/vim-less'
"Bundle 'joshtronic/php.vim' Bundle 'joshtronic/php.vim'
"Bundle 'jQuery' "Bundle 'jQuery'
Bundle 'kien/ctrlp.vim' Bundle 'kien/ctrlp.vim'
Bundle 'hail2u/vim-css3-syntax' Bundle 'hail2u/vim-css3-syntax'
@ -72,8 +72,8 @@ Bundle 'nanotech/jellybeans.vim'
Bundle 'pangloss/vim-javascript.git' Bundle 'pangloss/vim-javascript.git'
"Bundle 'rstacruz/sparkup', {'rtp': 'vim/'} "Bundle 'rstacruz/sparkup', {'rtp': 'vim/'}
"Bundle 'skammer/vim-css-color' "Bundle 'skammer/vim-css-color'
"Bundle 'scrooloose/syntastic' Bundle 'scrooloose/syntastic'
"Bundle 'shawncplus/phpcomplete.vim' Bundle 'shawncplus/phpcomplete.vim'
"Bundle 'SearchComplete' "Bundle 'SearchComplete'
colorscheme jellybeans colorscheme jellybeans

View file

@ -1,39 +1,23 @@
function username() function username()
{ {
if [[ `whoami` != 'josh' ]]; if [[ `whoami` != 'josh' ]];
then then
echo %{$FG[248]%}%n echo %{$FG[248]%}%n
fi fi
} }
function server() function server()
{ {
if [[ `hostname` != *.local ]]; if [[ `hostname` != *.home ]];
then then
echo "%{$FG[244]%}@%{$fg[magenta]%}%m " echo "%{$FG[244]%}@%{$fg[magenta]%}%m "
fi fi
}
function unread_email()
{
file=/tmp/UNREAD_GMAIL
if [[ -a $file ]];
then
unread=( $(<${file}) )
if [[ unread -ge 5 ]];
then
echo 📩
fi
fi
} }
USER="$(username)$(server)" USER="$(username)$(server)"
PROMPT=' PROMPT='
%{$USER%}%{$fg[blue]%}%~ $(git_prompt_info) %{$USER%}%{$fg[blue]%}%~ $(git_prompt_info)
%{$FG[244]%}%# %{$reset_color%}' %{$FG[244]%}%# %{$reset_color%}'
RPROMPT='$(unread_email)'
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}" ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}"
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"

View file

@ -38,7 +38,7 @@ alias vd="vimdiff"
export CLICOLOR=1 export CLICOLOR=1
export LSCOLORS=Exfxcxdxbxegedabagacad export LSCOLORS=Exfxcxdxbxegedabagacad
export GREP_OPTIONS="--color=auto" export GREP_OPTIONS="--color=auto --exclude-dir=.git --exclude-dir=artwork --exclude-dir=node_modules"
export EDITOR=vim export EDITOR=vim