diff --git a/.vim/bundle/zepto-vim b/.vim/bundle/zepto-vim index e246962..e096a64 160000 --- a/.vim/bundle/zepto-vim +++ b/.vim/bundle/zepto-vim @@ -1 +1 @@ -Subproject commit e24696285ea5a1f67e9f79822a8518305ad73f1f +Subproject commit e096a64c81656475897ac9e30b3e4b895093f085 diff --git a/Makefile b/Makefile index f76b2dd..c3c97bc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -all: bash ghc git input python scripts tmux valgrind vim zsh +all: bash ghc git input python scripts tmux valgrind vim zepto zsh bash: cp bash_profile ~/.bash_profile @@ -31,6 +31,9 @@ vim: cp vimrc ~/.vimrc cp -r .vim ~/.vim +zsh: + cp zeptorc ~/.zeptorc + zsh: cp zshrc ~/.zshrc cp pip-upgrade ~/.pip-upgrade diff --git a/zeptorc b/zeptorc new file mode 100644 index 0000000..bff190e --- /dev/null +++ b/zeptorc @@ -0,0 +1 @@ +(zepto:add-to-path (++ (get-home-dir) "/.zeps/")) diff --git a/zshrc b/zshrc index edf286e..9a41254 100644 --- a/zshrc +++ b/zshrc @@ -22,7 +22,7 @@ export GOPATH=~/.go export GOBIN=$GOPATH/bin export GHC_HOME=/usr/local/bin export CABAL_HOME=$HOME/.cabal/ -export PATH=$GHC_HOME:$CABAL_HOME/bin:$PATH:/opt/local/bin:/usr/local/sbin:~/.cabal/bin:$GOBIN +export PATH=$GHC_HOME:$CABAL_HOME/bin:$PATH:/opt/local/bin:/usr/local/sbin:~/.cabal/bin:/usr/local/opt/llvm/bin:$GOBIN export MANPATH=$MANPATH:/opt/local/share/man:/usr/local/opt/erlang/lib/erlang/man export INFOPATH=$INFOPATH:/opt/local/share/info export PYTHONSTARTUP=~/.pythonrc @@ -77,7 +77,7 @@ alias tmv="tmux split-window" alias tmh="tmux split-window -h" alias tms="tmux select-pane -t" alias tmk="killall tmux; tmux" -PROMPT="%{$fg[green]%}<%{$fg[red]%}%n%{$reset_color%}@%{$fg[green]%}%m%{$fg[green]%}>%{$reset_color%} " +PROMPT="%{$fg[red]%}%n%{$reset_color%} at %{$fg[green]%}%m%{$fg[green]%}%{$reset_color%}"$'\n'"=> " expand-or-complete-with-dots(){ echo -n "e[31m.....\e[0m" @@ -133,23 +133,23 @@ function rprompt-git-current-branch { color=%B%F{blue} fi - echo "$color$name$action%f%b " + echo "on $color$name$action%f%b " } function cabal_sandbox_info() { cabal_files=(*.cabal(N)) if [ $#cabal_files -gt 0 ]; then if [ -f cabal.sandbox.config ]; then - echo "%{$fg[green]%}sandboxed%{$reset_color%}" + echo " is %{$fg[green]%}sandboxed%{$reset_color%}" else - echo "%{$fg[red]%}not sandboxed%{$reset_color%}" + echo " is %{$fg[red]%}not sandboxed%{$reset_color%}" fi fi } RPROMPT='`rprompt-git-current-branch`' -RPROMPT+="%{$fg[yellow]%}%~%{$reset_color%}" -RPROMPT+=' `cabal_sandbox_info`' +RPROMPT+="in %{$fg[yellow]%}%~%{$reset_color%}" +RPROMPT+='`cabal_sandbox_info`' function ghc-pkg-reset() { read 'ans?erasing all your user ghc and cabal packages - are you sure (y/n) ? ' @@ -222,6 +222,7 @@ save_dotfiles(){ cp ~/.tmux.conf ${DOTPATH}tmux.conf cp ~/.valgrindrc ${DOTPATH}valgrindrc cp ~/.vimrc ${DOTPATH}vimrc + cp ~/.zeptorc ${DOTPATH}zeptorc cp ~/.zshrc ${DOTPATH}zshrc }