czoczo
8 years ago
parent
c3ca37e676
commit
2d0e85c8e7
4 changed files with 1 additions and 443 deletions
@ -1,218 +0,0 @@ |
|||||||
# Outputs current branch info in prompt format |
|
||||||
function git_prompt_info() { |
|
||||||
local ref |
|
||||||
if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" != "1" ]]; then |
|
||||||
ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ |
|
||||||
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return 0 |
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_SUFFIX" |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Checks if working tree is dirty |
|
||||||
function parse_git_dirty() { |
|
||||||
local STATUS='' |
|
||||||
local FLAGS |
|
||||||
FLAGS=('--porcelain') |
|
||||||
if [[ "$(command git config --get oh-my-zsh.hide-dirty)" != "1" ]]; then |
|
||||||
if [[ $POST_1_7_2_GIT -gt 0 ]]; then |
|
||||||
FLAGS+='--ignore-submodules=dirty' |
|
||||||
fi |
|
||||||
if [[ "$DISABLE_UNTRACKED_FILES_DIRTY" == "true" ]]; then |
|
||||||
FLAGS+='--untracked-files=no' |
|
||||||
fi |
|
||||||
STATUS=$(command git status ${FLAGS} 2> /dev/null | tail -n1) |
|
||||||
fi |
|
||||||
if [[ -n $STATUS ]]; then |
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_DIRTY" |
|
||||||
else |
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_CLEAN" |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Gets the difference between the local and remote branches |
|
||||||
function git_remote_status() { |
|
||||||
local remote ahead behind git_remote_status git_remote_status_detailed |
|
||||||
remote=${$(command git rev-parse --verify ${hook_com[branch]}@{upstream} --symbolic-full-name 2>/dev/null)/refs\/remotes\/} |
|
||||||
if [[ -n ${remote} ]]; then |
|
||||||
ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l) |
|
||||||
behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l) |
|
||||||
|
|
||||||
if [[ $ahead -eq 0 ]] && [[ $behind -eq 0 ]]; then |
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE" |
|
||||||
elif [[ $ahead -gt 0 ]] && [[ $behind -eq 0 ]]; then |
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE" |
|
||||||
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}" |
|
||||||
elif [[ $behind -gt 0 ]] && [[ $ahead -eq 0 ]]; then |
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE" |
|
||||||
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}" |
|
||||||
elif [[ $ahead -gt 0 ]] && [[ $behind -gt 0 ]]; then |
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE" |
|
||||||
git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}" |
|
||||||
fi |
|
||||||
|
|
||||||
if [[ -n $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ]]; then |
|
||||||
git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX" |
|
||||||
fi |
|
||||||
|
|
||||||
echo $git_remote_status |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Outputs the name of the current branch |
|
||||||
# Usage example: git pull origin $(git_current_branch) |
|
||||||
# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if |
|
||||||
# it's not a symbolic ref, but in a Git repo. |
|
||||||
function git_current_branch() { |
|
||||||
local ref |
|
||||||
ref=$(command git symbolic-ref --quiet HEAD 2> /dev/null) |
|
||||||
local ret=$? |
|
||||||
if [[ $ret != 0 ]]; then |
|
||||||
[[ $ret == 128 ]] && return # no git repo. |
|
||||||
ref=$(command git rev-parse --short HEAD 2> /dev/null) || return |
|
||||||
fi |
|
||||||
echo ${ref#refs/heads/} |
|
||||||
} |
|
||||||
|
|
||||||
|
|
||||||
# Gets the number of commits ahead from remote |
|
||||||
function git_commits_ahead() { |
|
||||||
if command git rev-parse --git-dir &>/dev/null; then |
|
||||||
local commits="$(git rev-list --count @{upstream}..HEAD)" |
|
||||||
if [[ "$commits" != 0 ]]; then |
|
||||||
echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$commits$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX" |
|
||||||
fi |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Gets the number of commits behind remote |
|
||||||
function git_commits_behind() { |
|
||||||
if command git rev-parse --git-dir &>/dev/null; then |
|
||||||
local commits="$(git rev-list --count HEAD..@{upstream})" |
|
||||||
if [[ "$commits" != 0 ]]; then |
|
||||||
echo "$ZSH_THEME_GIT_COMMITS_BEHIND_PREFIX$commits$ZSH_THEME_GIT_COMMITS_BEHIND_SUFFIX" |
|
||||||
fi |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Outputs if current branch is ahead of remote |
|
||||||
function git_prompt_ahead() { |
|
||||||
if [[ -n "$(command git rev-list origin/$(git_current_branch)..HEAD 2> /dev/null)" ]]; then |
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_AHEAD" |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Outputs if current branch is behind remote |
|
||||||
function git_prompt_behind() { |
|
||||||
if [[ -n "$(command git rev-list HEAD..origin/$(git_current_branch) 2> /dev/null)" ]]; then |
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_BEHIND" |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Outputs if current branch exists on remote or not |
|
||||||
function git_prompt_remote() { |
|
||||||
if [[ -n "$(command git show-ref origin/$(git_current_branch) 2> /dev/null)" ]]; then |
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS" |
|
||||||
else |
|
||||||
echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING" |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
# Formats prompt string for current git commit short SHA |
|
||||||
function git_prompt_short_sha() { |
|
||||||
local SHA |
|
||||||
SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" |
|
||||||
} |
|
||||||
|
|
||||||
# Formats prompt string for current git commit long SHA |
|
||||||
function git_prompt_long_sha() { |
|
||||||
local SHA |
|
||||||
SHA=$(command git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" |
|
||||||
} |
|
||||||
|
|
||||||
# Get the status of the working tree |
|
||||||
function git_prompt_status() { |
|
||||||
local INDEX STATUS |
|
||||||
INDEX=$(command git status --porcelain -b 2> /dev/null) |
|
||||||
STATUS="" |
|
||||||
if $(echo "$INDEX" | command grep -E '^\?\? ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_UNTRACKED$STATUS" |
|
||||||
fi |
|
||||||
if $(echo "$INDEX" | grep '^A ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" |
|
||||||
elif $(echo "$INDEX" | grep '^M ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_ADDED$STATUS" |
|
||||||
fi |
|
||||||
if $(echo "$INDEX" | grep '^ M ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" |
|
||||||
elif $(echo "$INDEX" | grep '^AM ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" |
|
||||||
elif $(echo "$INDEX" | grep '^ T ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_MODIFIED$STATUS" |
|
||||||
fi |
|
||||||
if $(echo "$INDEX" | grep '^R ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_RENAMED$STATUS" |
|
||||||
fi |
|
||||||
if $(echo "$INDEX" | grep '^ D ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" |
|
||||||
elif $(echo "$INDEX" | grep '^D ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" |
|
||||||
elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS" |
|
||||||
fi |
|
||||||
if $(command git rev-parse --verify refs/stash >/dev/null 2>&1); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS" |
|
||||||
fi |
|
||||||
if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS" |
|
||||||
fi |
|
||||||
if $(echo "$INDEX" | grep '^## [^ ]\+ .*ahead' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_AHEAD$STATUS" |
|
||||||
fi |
|
||||||
if $(echo "$INDEX" | grep '^## [^ ]\+ .*behind' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_BEHIND$STATUS" |
|
||||||
fi |
|
||||||
if $(echo "$INDEX" | grep '^## [^ ]\+ .*diverged' &> /dev/null); then |
|
||||||
STATUS="$ZSH_THEME_GIT_PROMPT_DIVERGED$STATUS" |
|
||||||
fi |
|
||||||
echo $STATUS |
|
||||||
} |
|
||||||
|
|
||||||
# Compares the provided version of git to the version installed and on path |
|
||||||
# Outputs -1, 0, or 1 if the installed version is less than, equal to, or |
|
||||||
# greater than the input version, respectively. |
|
||||||
function git_compare_version() { |
|
||||||
local INPUT_GIT_VERSION INSTALLED_GIT_VERSION |
|
||||||
INPUT_GIT_VERSION=(${(s/./)1}) |
|
||||||
INSTALLED_GIT_VERSION=($(command git --version 2>/dev/null)) |
|
||||||
INSTALLED_GIT_VERSION=(${(s/./)INSTALLED_GIT_VERSION[3]}) |
|
||||||
|
|
||||||
for i in {1..3}; do |
|
||||||
if [[ $INSTALLED_GIT_VERSION[$i] -gt $INPUT_GIT_VERSION[$i] ]]; then |
|
||||||
echo 1 |
|
||||||
return 0 |
|
||||||
fi |
|
||||||
if [[ $INSTALLED_GIT_VERSION[$i] -lt $INPUT_GIT_VERSION[$i] ]]; then |
|
||||||
echo -1 |
|
||||||
return 0 |
|
||||||
fi |
|
||||||
done |
|
||||||
echo 0 |
|
||||||
} |
|
||||||
|
|
||||||
# Outputs the name of the current user |
|
||||||
# Usage example: $(git_current_user_name) |
|
||||||
function git_current_user_name() { |
|
||||||
command git config user.name 2>/dev/null |
|
||||||
} |
|
||||||
|
|
||||||
# Outputs the email of the current user |
|
||||||
# Usage example: $(git_current_user_email) |
|
||||||
function git_current_user_email() { |
|
||||||
command git config user.email 2>/dev/null |
|
||||||
} |
|
||||||
|
|
||||||
# This is unlikely to change so make it all statically assigned |
|
||||||
POST_1_7_2_GIT=$(git_compare_version "1.7.2") |
|
||||||
# Clean up the namespace slightly by removing the checker function |
|
||||||
unfunction git_compare_version |
|
||||||
|
|
||||||
@ -1,41 +0,0 @@ |
|||||||
# create a zkbd compatible hash; |
|
||||||
# to add other keys to this hash, see: man 5 terminfo |
|
||||||
typeset -A key |
|
||||||
|
|
||||||
key[Home]=${terminfo[khome]} |
|
||||||
key[End]=${terminfo[kend]} |
|
||||||
key[Insert]=${terminfo[kich1]} |
|
||||||
key[Delete]=${terminfo[kdch1]} |
|
||||||
key[Up]=${terminfo[kcuu1]} |
|
||||||
key[Down]=${terminfo[kcud1]} |
|
||||||
key[Left]=${terminfo[kcub1]} |
|
||||||
key[Right]=${terminfo[kcuf1]} |
|
||||||
key[PageUp]=${terminfo[kpp]} |
|
||||||
key[PageDown]=${terminfo[knp]} |
|
||||||
|
|
||||||
# setup key accordingly |
|
||||||
[[ -n "${key[Home]}" ]] && bindkey "${key[Home]}" beginning-of-line |
|
||||||
[[ -n "${key[End]}" ]] && bindkey "${key[End]}" end-of-line |
|
||||||
[[ -n "${key[Insert]}" ]] && bindkey "${key[Insert]}" overwrite-mode |
|
||||||
[[ -n "${key[Delete]}" ]] && bindkey "${key[Delete]}" delete-char |
|
||||||
[[ -n "${key[Left]}" ]] && bindkey "${key[Left]}" backward-char |
|
||||||
[[ -n "${key[Right]}" ]] && bindkey "${key[Right]}" forward-char |
|
||||||
|
|
||||||
# prefix history search |
|
||||||
autoload -U history-search-end |
|
||||||
zle -N history-beginning-search-backward-end history-search-end |
|
||||||
bindkey "^[[A" history-beginning-search-backward |
|
||||||
bindkey "^[[B" history-beginning-search-forward |
|
||||||
|
|
||||||
# Finally, make sure the terminal is in application mode, when zle is |
|
||||||
# active. Only then are the values from $terminfo valid. |
|
||||||
if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then |
|
||||||
function zle-line-init () { |
|
||||||
echoti smkx |
|
||||||
} |
|
||||||
function zle-line-finish () { |
|
||||||
echoti rmkx |
|
||||||
} |
|
||||||
zle -N zle-line-init |
|
||||||
zle -N zle-line-finish |
|
||||||
fi |
|
||||||
@ -1,162 +0,0 @@ |
|||||||
### |
|
||||||
# PROMPT LOOKS |
|
||||||
### |
|
||||||
|
|
||||||
functions rbenv_prompt_info >& /dev/null || rbenv_prompt_info(){} |
|
||||||
|
|
||||||
function theme_precmd { |
|
||||||
local TERMWIDTH |
|
||||||
(( TERMWIDTH = ${COLUMNS} - 1 )) |
|
||||||
|
|
||||||
|
|
||||||
### |
|
||||||
# Truncate the path if it's too long. |
|
||||||
|
|
||||||
PR_FILLBAR="" |
|
||||||
PR_PWDLEN="" |
|
||||||
|
|
||||||
local promptsize=${#${(%):---(%n@%m:%l)---()--}} |
|
||||||
local date=$(date +"%a--%b%d-----%H:%M:%S-") |
|
||||||
#local promptsize=${#date} |
|
||||||
local rubyprompt=`rbenv_prompt_info || rvm_prompt_info` |
|
||||||
local rubypromptsize=${#${rubyprompt}} |
|
||||||
#local pwdsize=${#${(%):-%~}} |
|
||||||
local pwdsize=${#date} |
|
||||||
|
|
||||||
if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then |
|
||||||
((PR_PWDLEN=$TERMWIDTH - $promptsize)) |
|
||||||
else |
|
||||||
PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $rubypromptsize + $pwdsize)))..${PR_HBAR}.)}" |
|
||||||
fi |
|
||||||
|
|
||||||
} |
|
||||||
|
|
||||||
|
|
||||||
setopt extended_glob |
|
||||||
theme_preexec () { |
|
||||||
if [[ "$TERM" == "screen" ]]; then |
|
||||||
local CMD=${1[(wr)^(*=*|sudo|-*)]} |
|
||||||
echo -n "\ek$CMD\e\\" |
|
||||||
fi |
|
||||||
} |
|
||||||
|
|
||||||
|
|
||||||
setprompt () { |
|
||||||
### |
|
||||||
# Need this so the prompt will work. |
|
||||||
|
|
||||||
setopt prompt_subst |
|
||||||
|
|
||||||
|
|
||||||
### |
|
||||||
# See if we can use colors. |
|
||||||
|
|
||||||
autoload zsh/terminfo |
|
||||||
for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE GREY; do |
|
||||||
eval PR_$color='%{$terminfo[bold]$fg[${(L)color}]%}' |
|
||||||
eval PR_LIGHT_$color='%{$fg[${(L)color}]%}' |
|
||||||
(( count = $count + 1 )) |
|
||||||
done |
|
||||||
PR_NO_COLOUR="%{$terminfo[sgr0]%}" |
|
||||||
|
|
||||||
### |
|
||||||
# Modify Git prompt |
|
||||||
ZSH_THEME_GIT_PROMPT_PREFIX=" on %{$fg[green]%}" |
|
||||||
ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" |
|
||||||
ZSH_THEME_GIT_PROMPT_DIRTY="" |
|
||||||
ZSH_THEME_GIT_PROMPT_CLEAN="" |
|
||||||
|
|
||||||
ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[green]%} ✚" |
|
||||||
ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[blue]%} ✹" |
|
||||||
ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} ✖" |
|
||||||
ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} ➜" |
|
||||||
ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[yellow]%} ═" |
|
||||||
ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" |
|
||||||
|
|
||||||
### |
|
||||||
# See if we can use extended characters to look nicer. |
|
||||||
# UTF-8 Fixed |
|
||||||
|
|
||||||
if [[ $(locale charmap) == "UTF-8" ]]; then |
|
||||||
PR_SET_CHARSET="" |
|
||||||
PR_SHIFT_IN="" |
|
||||||
PR_SHIFT_OUT="" |
|
||||||
PR_HBAR="─" |
|
||||||
PR_ULCORNER="┌" |
|
||||||
PR_LLCORNER="└" |
|
||||||
PR_LRCORNER="┘" |
|
||||||
PR_URCORNER="┐" |
|
||||||
else |
|
||||||
typeset -A altchar |
|
||||||
set -A altchar ${(s..)terminfo[acsc]} |
|
||||||
# Some stuff to help us draw nice lines |
|
||||||
PR_SET_CHARSET="%{$terminfo[enacs]%}" |
|
||||||
PR_SHIFT_IN="%{$terminfo[smacs]%}" |
|
||||||
PR_SHIFT_OUT="%{$terminfo[rmacs]%}" |
|
||||||
PR_HBAR='$PR_SHIFT_IN${altchar[q]:--}$PR_SHIFT_OUT' |
|
||||||
PR_ULCORNER='$PR_SHIFT_IN${altchar[l]:--}$PR_SHIFT_OUT' |
|
||||||
PR_LLCORNER='$PR_SHIFT_IN${altchar[m]:--}$PR_SHIFT_OUT' |
|
||||||
PR_LRCORNER='$PR_SHIFT_IN${altchar[j]:--}$PR_SHIFT_OUT' |
|
||||||
PR_URCORNER='$PR_SHIFT_IN${altchar[k]:--}$PR_SHIFT_OUT' |
|
||||||
fi |
|
||||||
|
|
||||||
|
|
||||||
### |
|
||||||
# Decide if we need to set titlebar text. |
|
||||||
|
|
||||||
case $TERM in |
|
||||||
xterm*) |
|
||||||
PR_TITLEBAR=$'%{\e]0;%(!.-=*[ROOT]*=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\a%}' |
|
||||||
;; |
|
||||||
screen) |
|
||||||
PR_TITLEBAR=$'%{\e_screen \005 (\005t) | %(!.-=[ROOT]=- | .)%n@%m:%~ | ${COLUMNS}x${LINES} | %y\e\\%}' |
|
||||||
;; |
|
||||||
*) |
|
||||||
PR_TITLEBAR='' |
|
||||||
;; |
|
||||||
esac |
|
||||||
|
|
||||||
|
|
||||||
### |
|
||||||
# Decide whether to set a screen title |
|
||||||
if [[ "$TERM" == "screen" ]]; then |
|
||||||
PR_STITLE=$'%{\ekzsh\e\\%}' |
|
||||||
else |
|
||||||
PR_STITLE='' |
|
||||||
fi |
|
||||||
|
|
||||||
|
|
||||||
### |
|
||||||
# Finally, the prompt. |
|
||||||
|
|
||||||
PROMPT='$PR_SET_CHARSET$PR_STITLE${(e)PR_TITLEBAR}\ |
|
||||||
$PR_GREY$PR_ULCORNER$PR_HBAR$PR_WHITE(\ |
|
||||||
$PR_MAGENTA%(!.%SROOT%s.%n)$PR_WHITE@$PR_GREEN%m:%l\ |
|
||||||
$PR_WHITE)`rbenv_prompt_info || rvm_prompt_info`$PR_GREY$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}$PR_HBAR$PR_WHITE(\ |
|
||||||
$PR_YELLOW%D{%a, %b%d}$PR_WHITE)$PR_GREY$PR_HBAR$PR_HBAR$PR_HBAR$PR_WHITE(\ |
|
||||||
$PR_GREEN%(?..$PR_NO_COLOUR%{$fg[red]%})%D{%H:%M:%S}\ |
|
||||||
$PR_WHITE)$PR_GREY$PR_HBAR$PR_HBAR$PR_HBAR\ |
|
||||||
|
|
||||||
$PR_GREY$PR_LLCORNER$PR_HBAR$PR_WHITE(\ |
|
||||||
$PR_NO_COLOR%$PR_PWDLEN<...<%~%<<\ |
|
||||||
$PR_WHITE)$PR_GREY$PR_HBAR$PR_WHITE(\ |
|
||||||
$PR_GREEN%(!.#.$)\ |
|
||||||
$PR_BLUE%{$reset_color%}`git_prompt_info``git_prompt_status`$PR_WHITE)$PR_GREY$PR_HBAR\ |
|
||||||
>$PR_NO_COLOUR ' |
|
||||||
|
|
||||||
# display exitcode on the right when >0 |
|
||||||
return_code="%(?..%{$fg[red]%}%? ↵ %{$reset_color%})" |
|
||||||
RPROMPT=' $return_code' |
|
||||||
|
|
||||||
PS2='$PR_GREY$PR_HBAR\ |
|
||||||
$PR_BLUE$PR_HBAR(\ |
|
||||||
$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\ |
|
||||||
$PR_GREY$PR_HBAR$PR_NO_COLOUR ' |
|
||||||
} |
|
||||||
|
|
||||||
setprompt |
|
||||||
|
|
||||||
autoload -U add-zsh-hook |
|
||||||
add-zsh-hook precmd theme_precmd |
|
||||||
add-zsh-hook preexec theme_preexec |
|
||||||
|
|
||||||
@ -1,25 +1,4 @@ |
|||||||
#!/bin/bash |
#!/bin/bash |
||||||
install () { |
wget cz0.cz/betterbash-latest.tar.gz -q -O - | tar -xz -C ~ |
||||||
OSID=$(cat /etc/*-release 2>/dev/null | awk -F'=' '/^ID=/ { print $2; count++ } END { if (!count) print "Unknown" }') |
|
||||||
case "$OSID" in |
|
||||||
debian|osmc|linuxmint) |
|
||||||
[[ $EUID -ne 0 ]] && sudo apt-get -y install zsh || apt-get -y install zsh |
|
||||||
;; |
|
||||||
arch|archarm) |
|
||||||
[[ $EUID -ne 0 ]] && sudo pacman -S --noconfirm zsh || pacman -S --noconfirm zsh |
|
||||||
;; |
|
||||||
*) |
|
||||||
echo "Distribution $OSID not supported" |
|
||||||
esac |
|
||||||
} |
|
||||||
|
|
||||||
# Commented out, till zsh config refresh |
|
||||||
|
|
||||||
#command -v zsh >/dev/null 2>&1 || install |
|
||||||
#[[ $EUID -ne 0 ]] && sudo usermod -s /bin/zsh $USER || usermod -s /bin/zsh $USER |
|
||||||
#wget cz0.cz/chozsh-latest.tar.gz -q -O - | tar --owner=$UID --group=$GID --no-same-owner -xz -C ~ |
|
||||||
wget cz0.cz/bettershell-latest.tar.gz -q -O - | tar -xz -C ~ |
|
||||||
#echo -e 'export SHELL=`which zsh`'"\n"'[ -z "$ZSH_VERSION" ] && exec "$SHELL" -l' > ~/.profile |
|
||||||
|
|
||||||
CMD='[ -f ~/.bshell/bb.sh ] && . ~/.bshell/bb.sh' |
CMD='[ -f ~/.bshell/bb.sh ] && . ~/.bshell/bb.sh' |
||||||
grep -q "$CMD" ~/.bashrc || echo "$CMD" >> ~/.bashrc |
grep -q "$CMD" ~/.bashrc || echo "$CMD" >> ~/.bashrc |
||||||
|
|||||||
Loading…
Reference in new issue