Merge branch 'shifttab' of http://github.com/kremso/oh-my-zsh into kremso-shifttab
Robby Russell
14 years ago
commit
38243d7988
@ -0,0 +1,7 @@
|
|||||||
|
# get the name of the branch we are on
|
||||||
|
function rvm_prompt_info() {
|
||||||
|
ruby_version=$(~/.rvm/bin/rvm-prompt 2> /dev/null) || return
|
||||||
|
echo "($ruby_version)"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
# Aliases
|
||||||
|
alias g='git'
|
||||||
|
alias gst='git status'
|
||||||
|
alias gl='git pull'
|
||||||
|
alias gup='git fetch && git rebase'
|
||||||
|
alias gp='git push'
|
||||||
|
alias gd='git diff | mate'
|
||||||
|
alias gdv='git diff -w "$@" | vim -R -'
|
||||||
|
alias gc='git commit -v'
|
||||||
|
alias gca='git commit -v -a'
|
||||||
|
alias gb='git branch'
|
||||||
|
alias gba='git branch -a'
|
||||||
|
alias gcount='git shortlog -sn'
|
||||||
|
alias gcp='git cherry-pick'
|
||||||
|
|
||||||
|
|
||||||
|
# Git and svn mix
|
||||||
|
alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk'
|
||||||
|
|
||||||
|
#
|
||||||
|
# Will return the current branch name
|
||||||
|
# Usage example: git pull origin $(current_branch)
|
||||||
|
#
|
||||||
|
function current_branch() {
|
||||||
|
ref=$(git symbolic-ref HEAD 2> /dev/null) || return
|
||||||
|
echo ${ref#refs/heads/}
|
||||||
|
}
|
||||||
|
|
||||||
|
# these aliases take advangate of the previous function
|
||||||
|
alias ggpull='git pull origin $(current_branch)'
|
||||||
|
alias ggpush='git push origin $(current_branch)'
|
||||||
|
alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
# To use: add a .lighthouse file into your directory with the URL to the
|
||||||
|
# individual project. For example:
|
||||||
|
# https://rails.lighthouseapp.com/projects/8994
|
||||||
|
# Example usage: http://screencast.com/t/ZDgwNDUwNT
|
||||||
|
open_lighthouse_ticket () {
|
||||||
|
if [ ! -f .lighthouse-url ]; then
|
||||||
|
echo "There is no .lighthouse file in the current directory..."
|
||||||
|
return 0;
|
||||||
|
else
|
||||||
|
lighthouse_url=$(cat .lighthouse-url);
|
||||||
|
echo "Opening ticket #$1";
|
||||||
|
`open $lighthouse_url/tickets/$1`;
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
alias lho='open_lighthouse_ticket'
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
# commands to control local mysql-server installation
|
||||||
|
# paths are for osx installtion via macports
|
||||||
|
|
||||||
|
alias mysqlstart='sudo /opt/local/bin/mysqld_safe5'
|
||||||
|
alias mysqlstop='/opt/local/bin/mysqladmin5 -u root -p shutdown'
|
||||||
|
alias mysqlstatus='mysqladmin5 -u root -p ping'
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
function tab() {
|
||||||
|
osascript 2>/dev/null <<EOF
|
||||||
|
tell application "System Events"
|
||||||
|
tell process "Terminal" to keystroke "t" using command down
|
||||||
|
end
|
||||||
|
tell application "Terminal"
|
||||||
|
activate
|
||||||
|
do script with command "cd \"$PWD\"; $*" in window 1
|
||||||
|
end tell
|
||||||
|
EOF
|
||||||
|
}
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
alias sgem='sudo gem'
|
||||||
|
|
||||||
|
# Find ruby file
|
||||||
|
alias rfind='find . -name *.rb | xargs grep -n'
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
|
||||||
|
# TextMate
|
||||||
|
alias et='mate . &'
|
||||||
|
alias ett='mate app config lib db public spec test Rakefile Capfile Todo &'
|
||||||
|
alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
|
||||||
|
alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &'
|
||||||
|
|
||||||
|
# Editor Ruby file in TextMate
|
||||||
|
alias mr='mate CHANGELOG app config db lib public script spec test'
|
||||||
|
|
||||||
|
function tm() {
|
||||||
|
cd $1
|
||||||
|
mate $1
|
||||||
|
}
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
function zle-line-init zle-keymap-select {
|
||||||
|
zle reset-prompt
|
||||||
|
}
|
||||||
|
|
||||||
|
zle -N zle-line-init
|
||||||
|
zle -N zle-keymap-select
|
||||||
|
|
||||||
|
bindkey -v
|
||||||
|
|
||||||
|
# if mode indicator wasn't setup by theme, define default
|
||||||
|
if [[ "$MODE_INDICATOR" == "" ]]; then
|
||||||
|
MODE_INDICATOR="%{$fg_bold[red]%}<%{$fg[red]%}<<%{$reset_color%}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
function vi_mode_prompt_info() {
|
||||||
|
echo "${${KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# define right prompt, if it wasn't defined by a theme
|
||||||
|
if [[ "$RPS1" == "" && "$RPROMPT" == "" ]]; then
|
||||||
|
RPS1='$(vi_mode_prompt_info)'
|
||||||
|
fi
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
PROMPT='%{$fg[blue]%}%B%20~%b%{$reset_color%}%{$(git_prompt_info)%} $ '
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="(%{$fg[green]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="*%{$reset_color%}"
|
||||||
|
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="yellow"; fi
|
||||||
|
|
||||||
|
PROMPT='%{$fg[$NCOLOR]%}%c ➤ %{$reset_color%}'
|
||||||
|
RPROMPT='%{$fg[$NCOLOR]%}%p $(git_prompt_info)%{$reset_color%}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="git:"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="*"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
|
# See http://geoff.greer.fm/lscolors/
|
||||||
|
export LSCOLORS="exfxcxdxbxbxbxbxbxbxbx"
|
||||||
|
export LS_COLORS="di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=31;40:cd=31;40:su=31;40:sg=31;40:tw=31;40:ow=31;40:"
|
||||||
|
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
|
||||||
|
PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(rvm_prompt_info)$fg_bold[blue] ]$reset_color
|
||||||
|
$ '
|
||||||
|
# git theming
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[green]("
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="✔"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="✗"
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
PROMPT=$'%{$fg_bold[green]%}%n@%m %{$fg[blue]%}%D{[%I:%M:%S]} %{$reset_color%}%{$fg[white]%}[%~]%{$reset_color%} $(git_prompt_info)\
|
||||||
|
%{$fg[blue]%}->%{$fg_bold[blue]%} %#%{$reset_color%} '
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}["
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
# Personalized!
|
||||||
|
|
||||||
|
# Grab the current date (%D) and time (%T) wrapped in {}: {%D %T}
|
||||||
|
DALLAS_CURRENT_TIME_="%{$fg[white]%}{%{$fg[yellow]%}%D %T%{$fg[white]%}}%{$reset_color%}"
|
||||||
|
# Grab the current version of ruby in use (via RVM): [ruby-1.8.7]
|
||||||
|
DALLAS_CURRENT_RUBY_="%{$fg[white]%}[%{$fg[magenta]%}\$(~/.rvm/bin/rvm-prompt i v)%{$fg[white]%}]%{$reset_color%}"
|
||||||
|
# Grab the current machine name: muscato
|
||||||
|
DALLAS_CURRENT_MACH_="%{$fg[green]%}%m%{$fg[white]%}:%{$reset_color%}"
|
||||||
|
# Grab the current filepath, use shortcuts: ~/Desktop
|
||||||
|
# Append the current git branch, if in a git repository: ~aw@master
|
||||||
|
DALLAS_CURRENT_LOCA_="%{$fg[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
|
||||||
|
# Grab the current username: dallas
|
||||||
|
DALLAS_CURRENT_USER_="%{$fg[red]%}%n%{$reset_color%}"
|
||||||
|
# Use a % for normal users and a # for privelaged (root) users.
|
||||||
|
DALLAS_PROMPT_CHAR_="%{$fg[white]%}%(!.#.%%)%{$reset_color%}"
|
||||||
|
# For the git prompt, use a white @ and blue text for the branch name
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}@%{$fg[blue]%}"
|
||||||
|
# Close it all off by resetting the color and styles.
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
# Do nothing if the branch is clean (no changes).
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
# Add 3 cyan ✗s if this branch is diiirrrty! Dirty branch!
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[cyan]%}✗✗✗"
|
||||||
|
|
||||||
|
# Put it all together!
|
||||||
|
PROMPT="$DALLAS_CURRENT_TIME_$DALLAS_CURRENT_RUBY_$DALLAS_CURRENT_MACH_$DALLAS_CURRENT_LOCA_ $DALLAS_CURRENT_USER_$DALLAS_PROMPT_CHAR_ "
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
# Copied and modified from the oh-my-zsh theme from geoffgarside
|
||||||
|
# Red server name, green cwd, blue git status
|
||||||
|
|
||||||
|
PROMPT='%{$fg[red]%}%m%{$reset_color%}:%{$fg[green]%}%c%{$reset_color%}$(git_prompt_info) %(!.#.$) '
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[blue]%}("
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[green]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
|
function prompt_char {
|
||||||
|
if [ "$(whoami)" = "root" ]; then echo "%{$fg[red]%}#%{$reset_color%}"; else echo $; fi
|
||||||
|
}
|
||||||
|
|
||||||
|
PROMPT='%(?, ,%{$fg[red]%}FAIL%{$reset_color%}
|
||||||
|
)
|
||||||
|
%{$fg[magenta]%}%n%{$reset_color%}@%{$fg[yellow]%}%m%{$reset_color%}: %{$fg_bold[blue]%}%~%{$reset_color%}$(git_prompt_info)
|
||||||
|
%_ $(prompt_char) '
|
||||||
|
|
||||||
|
RPROMPT='%{$fg[green]%}[%*]%{$reset_color%}'
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
function prompt_char {
|
||||||
|
git branch >/dev/null 2>/dev/null && echo '±' && return
|
||||||
|
hg root >/dev/null 2>/dev/null && echo 'Hg' && return
|
||||||
|
echo '○'
|
||||||
|
}
|
||||||
|
|
||||||
|
function virtualenv_info {
|
||||||
|
[ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
|
||||||
|
}
|
||||||
|
|
||||||
|
PROMPT='
|
||||||
|
%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(git_prompt_info)
|
||||||
|
$(virtualenv_info)$(prompt_char) '
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
|
||||||
|
# user, host, full path, and time/date
|
||||||
|
# on two lines for easier vgrepping
|
||||||
|
# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
|
||||||
|
PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;34m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}%!%{\e[0;34m%}%B]%b%{\e[0m%}
|
||||||
|
%{\e[0;34m%}%B└─%B[%{\e[1;35m%}$%{\e[0;34m%}%B]%{\e[0m%}%b '
|
||||||
|
RPROMPT='[%*]'
|
||||||
|
PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
#RVM settings
|
||||||
|
if [[ -s ~/.rvm/scripts/rvm ]] ; then
|
||||||
|
RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
|
||||||
|
fi
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
|
#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
|
||||||
|
git_custom_status() {
|
||||||
|
local cb=$(current_branch)
|
||||||
|
if [ -n "$cb" ]; then
|
||||||
|
echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
PROMPT='$(git_custom_status)%{$fg[cyan]%}[%~% ]%{$reset_color%}%B$%b '
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg_bold[white]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
# Copied from old version of tonotdo's theme. LSCOLORS modified.
|
||||||
|
PROMPT='%{$fg_no_bold[cyan]%}%n%{$fg_no_bold[magenta]%}•%{$fg_no_bold[green]%}%3~$(git_prompt_info)%{$reset_color%}» '
|
||||||
|
RPROMPT='[%*]'
|
||||||
|
|
||||||
|
# git theming
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg_no_bold[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[blue]%})"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[yellow]%}⚡%{$fg_bold[blue]%})"
|
||||||
|
|
||||||
|
export LSCOLORS="exfxcxdxbxegedabagacad"
|
||||||
|
export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
PROMPT='%{$fg_bold[red]%}➜ %{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[white]%}$(git_prompt_info)%{$fg_bold[white]%} % %{$reset_color%}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[white]%}) %{$fg[yellow]%}✗%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[white]%})"
|
||||||
@ -0,0 +1,43 @@
|
|||||||
|
grey='\e[0;90m'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$grey%}("
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$grey%}) %{$fg[yellow]%}✗%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$grey%})"
|
||||||
|
|
||||||
|
function josh_prompt {
|
||||||
|
(( spare_width = ${COLUMNS} ))
|
||||||
|
prompt=" "
|
||||||
|
|
||||||
|
branch=$(current_branch)
|
||||||
|
ruby_version=$(rvm_prompt_info)
|
||||||
|
path_size=${#PWD}
|
||||||
|
branch_size=${#branch}
|
||||||
|
ruby_size=${#ruby_version}
|
||||||
|
user_machine_size=${#${(%):-%n@%m-}}
|
||||||
|
|
||||||
|
if [[ ${#branch} -eq 0 ]]
|
||||||
|
then (( ruby_size = ruby_size + 1 ))
|
||||||
|
else
|
||||||
|
(( branch_size = branch_size + 4 ))
|
||||||
|
if [[ -n $(git status -s 2> /dev/null) ]]; then
|
||||||
|
(( branch_size = branch_size + 2 ))
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
(( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
|
||||||
|
|
||||||
|
while [ ${#prompt} -lt $spare_width ]; do
|
||||||
|
prompt=" $prompt"
|
||||||
|
done
|
||||||
|
|
||||||
|
prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(rvm_prompt_info)%{$reset_color%} $(git_prompt_info)"
|
||||||
|
|
||||||
|
echo $prompt
|
||||||
|
}
|
||||||
|
|
||||||
|
setopt prompt_subst
|
||||||
|
|
||||||
|
PROMPT='
|
||||||
|
%n@%m $(josh_prompt)
|
||||||
|
%(?,%{%F{green}%},%{%F{red}%})⚡%{$reset_color%} '
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
# ZSH Theme - Preview: http://dl.dropbox.com/u/1552408/Screenshots/2010-04-08-oh-my-zsh.png
|
||||||
|
|
||||||
|
if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
|
||||||
|
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
||||||
|
|
||||||
|
PROMPT='%{$fg[$NCOLOR]%}%n%{$fg[green]%}@%m%{$reset_color%} %~ \
|
||||||
|
$(git_prompt_info)\
|
||||||
|
%{$fg[red]%}%(!.#.»)%{$reset_color%} '
|
||||||
|
PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
|
||||||
|
RPS1='${return_code}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}±%{$fg[yellow]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="⚡"
|
||||||
|
|
||||||
@ -0,0 +1,80 @@
|
|||||||
|
# vim: set ts=2 textwidth=0
|
||||||
|
|
||||||
|
autoload -U add-zsh-hook
|
||||||
|
autoload -Uz vcs_info
|
||||||
|
local c0=$(printf "\033[0m")
|
||||||
|
local c1=$(printf "\033[38;5;215m")
|
||||||
|
local c2=$(printf "\033[38;5;209m")
|
||||||
|
local c3=$(printf "\033[38;5;203m")
|
||||||
|
local c4=$(printf "\033[33;4m")
|
||||||
|
local c5=$(printf "\033[38;5;137m")
|
||||||
|
local c6=$(printf "\033[38;5;240m")
|
||||||
|
local c7=$(printf "\033[38;5;149m")
|
||||||
|
local c8=$(printf "\033[38;5;126m")
|
||||||
|
local c9=$(printf "\033[38;5;162m")
|
||||||
|
|
||||||
|
local foopath=$(perl /home/scp1/bin/foopath)
|
||||||
|
|
||||||
|
if [ "$TERM" = "linux" ]; then
|
||||||
|
c1=$(printf "\033[34;1m")
|
||||||
|
c2=$(printf "\033[35m")
|
||||||
|
c3=$(printf "\033[31m")
|
||||||
|
c4=$(printf "\033[31;1m")
|
||||||
|
c5=$(printf "\033[32m")
|
||||||
|
c6=$(printf "\033[32;1m")
|
||||||
|
c7=$(printf "\033[33m")
|
||||||
|
c8=$(printf "\033[33;1m")
|
||||||
|
c9=$(printf "\033[34m")
|
||||||
|
fi
|
||||||
|
|
||||||
|
#local newtv=$(perl $HOME/devel/newtv.pl)
|
||||||
|
local newtv=''
|
||||||
|
|
||||||
|
zstyle ':vcs_info:*' actionformats \
|
||||||
|
'%{$c8%}(%f%s)%{$c7%}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
|
||||||
|
zstyle ':vcs_info:*' formats \
|
||||||
|
"%{$c8%}%s%{$c7%}:%{$c7%}(%{$c9%}%b%{$c7%})%f "
|
||||||
|
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
|
||||||
|
zstyle ':vcs_info:*' enable git
|
||||||
|
|
||||||
|
add-zsh-hook precmd prompt_jnrowe_precmd
|
||||||
|
|
||||||
|
prompt_jnrowe_precmd () {
|
||||||
|
vcs_info
|
||||||
|
|
||||||
|
if [ "${vcs_info_msg_0_}" = "" ]; then
|
||||||
|
#dir_status="|%F{3}%n%F{7}@%F{3}%m%F{7}:%F{9}%l%f"
|
||||||
|
#dir_status="$c1%n%F{7}@%F{9}%m%F{7}:%F{12}%/"
|
||||||
|
dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
|
||||||
|
#dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$foopath%} %{$c0%}(%{$c5%}%?%{$c0%})"
|
||||||
|
|
||||||
|
PROMPT='%{$fg_bold[green]%}%p%{$reset_color%}${vcs_info_msg_0_}${dir_status} ${ret_status}%{$reset_color%}
|
||||||
|
> '
|
||||||
|
elif [[ $(git diff --cached --name-status 2>/dev/null ) != "" ]]; then
|
||||||
|
dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
|
||||||
|
PROMPT='${vcs_info_msg_0_}
|
||||||
|
%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
|
||||||
|
> '
|
||||||
|
|
||||||
|
elif [[ $(git diff --name-status 2>/dev/null ) != "" ]]; then
|
||||||
|
dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
|
||||||
|
|
||||||
|
PROMPT='${vcs_info_msg_0_}
|
||||||
|
%{$fg_bold[green]%}%p%{$reset_color%}${dir_status}%{$reset_color%}
|
||||||
|
%{$c9%}·>%{$c0%} '
|
||||||
|
else
|
||||||
|
dir_status="%{$c1%}%n%{$c4%}@%{$c2%}%m%{$c0%}:%{$c3%}%l%{$c6%}->%{$c4%}%/ %{$c0%}(%{$c5%}%?%{$c0%})"
|
||||||
|
PROMPT='${vcs_info_msg_0_}
|
||||||
|
%{$fg_bold[green]%}%p%{$reset_color%}${dir_status} ${vcs_info_msg_0_}%{$reset_color%}
|
||||||
|
> '
|
||||||
|
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$reset_color%} ${vcs_info_msg_0_}${dir_status}%{$reset_color%}
|
||||||
|
#> '
|
||||||
|
|
||||||
|
# vim: set ft=zsh ts=4 sw=4 et:
|
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
PROMPT='%{$fg_bold[magenta]%}%1~$(git_prompt_info) %{$fg_bold[magenta]%}%# %{$reset_color%}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}["
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="*]"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="]"
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
setopt prompt_subst
|
||||||
|
autoload colors
|
||||||
|
colors
|
||||||
|
|
||||||
|
autoload -U add-zsh-hook
|
||||||
|
autoload -Uz vcs_info
|
||||||
|
|
||||||
|
# check-for-changes can be really slow.
|
||||||
|
# you should disable it, if you work with large repositories
|
||||||
|
zstyle ':vcs_info:*:prompt:*' check-for-changes true
|
||||||
|
|
||||||
|
add-zsh-hook precmd mikeh_precmd
|
||||||
|
|
||||||
|
mikeh_precmd() {
|
||||||
|
vcs_info
|
||||||
|
}
|
||||||
|
|
||||||
|
# user, host, full path, and time/date
|
||||||
|
# on two lines for easier vgrepping
|
||||||
|
# entry in a nice long thread on the Arch Linux forums: http://bbs.archlinux.org/viewtopic.php?pid=521888#p521888
|
||||||
|
PROMPT=$'%{\e[0;34m%}%B..[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%a %b %d, %I:%M"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%}
|
||||||
|
%{\e[0;34m%}%B..%B[%{\e[1;35m%}$%{\e[0;34m%}%B] <($vcs_info_msg_0_)>%{\e[0m%}%b '
|
||||||
|
PS2=$' \e[0;34m%}%B>%{\e[0m%}%b '
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
PROMPT='%{$fg_bold[red]%}%m%{$reset_color%}:%{$fg[cyan]%}%c%{$reset_color%}:%# '
|
||||||
|
RPROMPT='%{$fg_bold[green]%}$(git_prompt_info)%{$reset_color%}% '
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="<%{$fg[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%} %{$fg[yellow]%}✗%{$fg[green]%}>%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}>"
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
if [ "$(whoami)" = "root" ]; then NCOLOR="red"; else NCOLOR="green"; fi
|
||||||
|
|
||||||
|
PROMPT='
|
||||||
|
%{$fg[$NCOLOR]%}%B%n@%m%b%{$reset_color%} %{$fg[white]%}%B${PWD/#$HOME/~}%b%{$reset_color%}
|
||||||
|
$(git_prompt_info)%(!.#.$) '
|
||||||
|
RPROMPT='[%*]'
|
||||||
|
|
||||||
|
# git theming
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_no_bold[yellow]%}%B"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%}*"
|
||||||
|
|
||||||
|
# LS colors, made with http://geoff.greer.fm/lscolors/
|
||||||
|
export LSCOLORS="Gxfxcxdxbxegedabagacad"
|
||||||
|
export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
PROMPT='
|
||||||
|
%n@%m %{$fg[cyan]%}%~
|
||||||
|
%? $(git_prompt_info)%{$fg_bold[blue]%}%% %{$reset_color%}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%}"
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
PROMPT='%{$fg_bold[green]%}%h %{$fg[cyan]%}%2~ %{$fg_bold[blue]%}$(git_prompt_info) %{$reset_color%}» '
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="git:(%{$fg[red]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
|
||||||
|
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
# zsh theme requires 256 color enabled terminal
|
||||||
|
# i.e TERM=xterm-256color
|
||||||
|
# Preview - http://www.flickr.com/photos/adelcampo/4556482563/sizes/o/
|
||||||
|
# based on robbyrussell's shell but louder!
|
||||||
|
|
||||||
|
PROMPT='%{$fg_bold[blue]%}$(git_prompt_info) %F{208}%c%f
|
||||||
|
%{$fg_bold[white]%}%# %{$reset_color%}'
|
||||||
|
RPROMPT='%B%F{208}%n%f%{$fg_bold[white]%}@%F{039}%m%f%{$reset_color%}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%F{154}±|%f%F{124}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}%B✘%b%F{154}|%f%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=" %{$fg[green]%}✔%F{154}|"
|
||||||
@ -0,0 +1,27 @@
|
|||||||
|
#
|
||||||
|
# PROMPT
|
||||||
|
#
|
||||||
|
PROMPT_BRACKET_BEGIN='%{$fg_bold[white]%}['
|
||||||
|
PROMPT_HOST='%{$fg_bold[cyan]%}%m'
|
||||||
|
PROMPT_SEPARATOR='%{$reset_color%}:'
|
||||||
|
PROMPT_DIR='%{$fg_bold[yellow]%}%c'
|
||||||
|
PROMPT_BRACKET_END='%{$fg_bold[white]%}]'
|
||||||
|
|
||||||
|
PROMPT_USER='%{$fg_bold[white]%}%n'
|
||||||
|
PROMPT_SIGN='%{$reset_color%}%#'
|
||||||
|
|
||||||
|
GIT_PROMPT_INFO='$(git_prompt_info)'
|
||||||
|
|
||||||
|
# My current prompt looks like:
|
||||||
|
# [host:current_dir] (git_prompt_info)
|
||||||
|
# [username]%
|
||||||
|
PROMPT="${PROMPT_BRACKET_BEGIN}${PROMPT_HOST}${PROMPT_SEPARATOR}${PROMPT_DIR}${PROMPT_BRACKET_END}${GIT_PROMPT_INFO}
|
||||||
|
${PROMPT_BRACKET_BEGIN}${PROMPT_USER}${PROMPT_BRACKET_END}${PROMPT_SIGN} "
|
||||||
|
|
||||||
|
#
|
||||||
|
# Git repository
|
||||||
|
#
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=''
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
function prompt_char {
|
||||||
|
git branch >/dev/null 2>/dev/null && echo '±' && return
|
||||||
|
hg root >/dev/null 2>/dev/null && echo '☿' && return
|
||||||
|
echo '○'
|
||||||
|
}
|
||||||
|
|
||||||
|
function virtualenv_info {
|
||||||
|
[ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
|
||||||
|
}
|
||||||
|
|
||||||
|
function hg_prompt_info {
|
||||||
|
hg prompt --angle-brackets "\
|
||||||
|
< on %{$fg[magenta]%}<branch>%{$reset_color%}>\
|
||||||
|
< at %{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
|
||||||
|
%{$fg[green]%}<status|modified|unknown><update>%{$reset_color%}<
|
||||||
|
patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset_color%})|pre_unapplied(%{$fg_bold[black]%})|post_unapplied(%{$reset_color%})>>" 2>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
PROMPT='
|
||||||
|
%{$fg[magenta]%}%n%{$reset_color%} at %{$fg[yellow]%}%m%{$reset_color%} in %{$fg_bold[green]%}${PWD/#$HOME/~}%{$reset_color%}$(hg_prompt_info)$(git_prompt_info)
|
||||||
|
$(virtualenv_info)$(prompt_char) '
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[magenta]%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[green]%}!"
|
||||||
|
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||||
|
|
||||||
|
. ~/bin/dotfiles/zsh/aliases
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
PROMPT='%{${fg_bold[yellow]}%}%n%{$reset_color%}%{${fg[yellow]}%}@%m%{$reset_color%} $(git_prompt_info)%(?,,%{${fg_bold[white]}%}[%?]%{$reset_color%} )%{$fg[yellow]%}%#%{$reset_color%} '
|
||||||
|
RPROMPT='%{$fg[green]%}%~%{$reset_color%}'
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%}("
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
|
||||||
|
ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%})%{$fg[red]%}✗%{$reset_color%}"
|
||||||
|
ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
|
||||||
@ -1,5 +1,12 @@
|
|||||||
current_path=`pwd`
|
current_path=`pwd`
|
||||||
echo "Upgrading Oh My Zsh"
|
echo "Upgrading Oh My Zsh"
|
||||||
( cd $ZSH && git pull origin master )
|
( cd $ZSH && git pull origin master )
|
||||||
|
echo ' __ __ '
|
||||||
|
echo ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
|
||||||
|
echo ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '
|
||||||
|
echo '/ /_/ / / / / / / / / / / /_/ / / /_(__ ) / / / '
|
||||||
|
echo '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ '
|
||||||
|
echo ' /____/'
|
||||||
echo "Hooray! Oh My Zsh has been updated and/or is at the current version. \nAny new updates will be reflected when you start your next terminal session."
|
echo "Hooray! Oh My Zsh has been updated and/or is at the current version. \nAny new updates will be reflected when you start your next terminal session."
|
||||||
|
echo "To keep up on the latest, be sure to follow Oh My Zsh on twitter: http://twitter.com/ohmyzsh"
|
||||||
cd $current_path
|
cd $current_path
|
||||||
Loading…
Reference in new issue