more shell cleanup
This commit is contained in:
parent
337de3fcba
commit
9d3d50c66e
@ -3,15 +3,10 @@
|
|||||||
if [ -z $SSH_CONNECTION ]; then HCOLOR="green"; else HCOLOR="blue"; fi
|
if [ -z $SSH_CONNECTION ]; then HCOLOR="green"; else HCOLOR="blue"; fi
|
||||||
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
||||||
|
|
||||||
ZSH_THEME_RVM_PROMPT_PREFIX="("
|
|
||||||
ZSH_THEME_RVM_PROMPT_SUFFIX="/"
|
|
||||||
ZSH_THEME_NVM_PROMPT_PREFIX=""
|
|
||||||
ZSH_THEME_NVM_PROMPT_SUFFIX=")"
|
|
||||||
|
|
||||||
PROMPT='%{$fg[$HCOLOR]%}%m%{$reset_color%}:%c \
|
PROMPT='%{$fg[$HCOLOR]%}%m%{$reset_color%}:%c \
|
||||||
$(git_prompt_info)%{$fg[red]%}%(!.#.»)%{$reset_color%} '
|
$(git_prompt_info)%{$fg[red]%}%(!.#.»)%{$reset_color%} '
|
||||||
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
|
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
|
||||||
RPS1='%{$fg[cyan]%}$(ruby_prompt_info)node-$(nvm_prompt_info) %{$reset_color%}${return_code}'
|
RPS1='%{$fg[cyan]%}(ruby-$(ruby_prompt_info)/node-$(nvm_prompt_info)) %{$reset_color%}${return_code}'
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}"
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}"
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
||||||
|
25
home/.zshrc
25
home/.zshrc
@ -19,13 +19,19 @@ export ZSH_CUSTOM=$HOME/.zsh/custom
|
|||||||
|
|
||||||
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
plugins=(extract command-not-found tmux tmuxinator git github git-flow ruby gem rvm rails bundler heroku ssh-agent npm nvm yarn pyenv golang drush composer vagrant knife docker docker-compose mix mix-fast)
|
plugins=(extract command-not-found tmux tmuxinator git github git-flow ssh-agent golang vagrant knife docker docker-compose mix mix-fast)
|
||||||
|
|
||||||
# Python/ virtualenv
|
# ruby
|
||||||
if [ -f /usr/local/bin/virtualenvwrapper.sh ]; then
|
plugins=($plugins ruby gem rbenv rails bundler heroku)
|
||||||
export WORKON_HOME=$HOME/.virtualenvs
|
|
||||||
plugins=($plugins virtualenvwrapper pip django fabric)
|
# node
|
||||||
fi
|
plugins=($plugins nvm npm yarn)
|
||||||
|
|
||||||
|
# python
|
||||||
|
plugins=($plugins pyenv pip)
|
||||||
|
|
||||||
|
# php / drupal
|
||||||
|
plugins=($plugins drush composer)
|
||||||
|
|
||||||
# Platform specific settings
|
# Platform specific settings
|
||||||
case "$OSTYPE" in
|
case "$OSTYPE" in
|
||||||
@ -39,6 +45,11 @@ esac
|
|||||||
|
|
||||||
UNBUNDLED_COMMANDS=(knife)
|
UNBUNDLED_COMMANDS=(knife)
|
||||||
|
|
||||||
|
# nvm from homebrew
|
||||||
|
if [ -f /usr/local/opt/nvm/nvm.sh ]; then
|
||||||
|
source /usr/local/opt/nvm/nvm.sh
|
||||||
|
fi
|
||||||
|
|
||||||
# OH MY ZSH!
|
# OH MY ZSH!
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
@ -59,5 +70,3 @@ if [ $TERM = "screen" ]; then
|
|||||||
fi
|
fi
|
||||||
export EDITOR="vim"
|
export EDITOR="vim"
|
||||||
export LSCOLORS="ExGxFxdxCxDxDxhbadExEx"
|
export LSCOLORS="ExGxFxdxCxDxDxhbadExEx"
|
||||||
|
|
||||||
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user