Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
This commit is contained in:
commit
6a39f81093
@ -21,3 +21,5 @@ alias ll='ls -l'
|
||||
alias sl=ls # often screw this up
|
||||
|
||||
alias afind='ack-grep -il'
|
||||
|
||||
alias x=extract
|
||||
|
@ -34,5 +34,3 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" # Text to display if the branch is c
|
||||
# Setup the prompt with pretty colors
|
||||
setopt prompt_subst
|
||||
|
||||
# Load the theme
|
||||
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
|
@ -37,3 +37,39 @@ function take() {
|
||||
mkdir -p $1
|
||||
cd $1
|
||||
}
|
||||
|
||||
function extract() {
|
||||
unset REMOVE_ARCHIVE
|
||||
|
||||
if test "$1" = "-r"; then
|
||||
REMOVE=1
|
||||
shift
|
||||
fi
|
||||
if [[ -f $1 ]]; then
|
||||
case $1 in
|
||||
*.tar.bz2) tar xvjf $1;;
|
||||
*.tar.gz) tar xvzf $1;;
|
||||
*.tar.xz) tar xvJf $1;;
|
||||
*.tar.lzma) tar --lzma -xvf $1;;
|
||||
*.bz2) bunzip $1;;
|
||||
*.rar) unrar $1;;
|
||||
*.gz) gunzip $1;;
|
||||
*.tar) tar xvf $1;;
|
||||
*.tbz2) tar xvjf $1;;
|
||||
*.tgz) tar xvzf $1;;
|
||||
*.zip) unzip $1;;
|
||||
*.Z) uncompress $1;;
|
||||
*.7z) 7z x $1;;
|
||||
*) echo "'$1' cannot be extracted via >extract<";;
|
||||
esac
|
||||
|
||||
if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
|
||||
echo removing "$1";
|
||||
/bin/rm "$1";
|
||||
fi
|
||||
|
||||
else
|
||||
echo "'$1' is not a valid file"
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -14,6 +14,9 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
|
||||
plugin=${plugin:=()}
|
||||
for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
|
||||
|
||||
# Load the theme
|
||||
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
|
||||
|
||||
# Check for updates on initial load...
|
||||
if [ "$DISABLE_AUTO_UPDATE" = "true" ]
|
||||
then
|
||||
|
@ -1,6 +1,16 @@
|
||||
# Comment
|
||||
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX=' (git:'
|
||||
ZSH_THEME_GIT_PROMPT_SUFFIX=')'
|
||||
PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
|
||||
|
||||
PROMPT='%{$fg[magenta]%}[%c]$(git_prompt_info) $ %{$reset_color%}'
|
||||
RPROMPT='%{$fg[magenta]%}$(git_prompt_info)%{$reset_color%} $(git_prompt_status)%{$reset_color%}'
|
||||
|
||||
ZSH_THEME_GIT_PROMPT_PREFIX=""
|
||||
ZSH_THEME_GIT_PROMPT_SUFFIX=""
|
||||
ZSH_THEME_GIT_PROMPT_DIRTY=""
|
||||
ZSH_THEME_GIT_PROMPT_CLEAN=""
|
||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[cyan]%} ✈"
|
||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[yellow]%} ✭"
|
||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✗"
|
||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[blue]%} ➦"
|
||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[magenta]%} ✂"
|
||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[grey]%} ✱"
|
Loading…
Reference in New Issue
Block a user