diff options
| -rw-r--r-- | himbeer.zsh-theme | 164 | ||||
| -rw-r--r-- | shell_only.sh | 3 | ||||
| -rw-r--r-- | zshrc | 2 |
3 files changed, 1 insertions, 168 deletions
diff --git a/himbeer.zsh-theme b/himbeer.zsh-theme deleted file mode 100644 index 3013449..0000000 --- a/himbeer.zsh-theme +++ /dev/null @@ -1,164 +0,0 @@ -functions rbenv_prompt_info >& /dev/null || rbenv_prompt_info(){} - -if [[ "$USER_ALIAS" == "" ]]; then - USER_ALIAS=$USER -fi - -function theme_precmd { - local TERMWIDTH - (( TERMWIDTH = ${COLUMNS} - 1 )) - - - ### - # Truncate the path if it's too long. - - PR_FILLBAR="" - PR_PWDLEN="" - - if [[ "$USER_ALIAS" == "" ]]; then - USER_ALIAS=$USER - fi - - if [[ "$USER_ALIAS_LENGTH" == "" ]]; then - USER_ALIAS_LENGTH=${#${USER_ALIAS}} - fi - - local promptsize=${#${(%):-------[@%m:%l)---()--}} - local rubyprompt=`rvm_prompt_info || rbenv_prompt_info` - local rubypromptsize=${#${rubyprompt}} - local pwdsize=${#${(%):-%~}} - - if [[ "$promptsize + $rubypromptsize + $pwdsize" -gt $TERMWIDTH ]]; then - ((PR_PWDLEN=$TERMWIDTH - $promptsize)) - else - PR_FILLBAR="\${(l.(($TERMWIDTH - ($promptsize + $USER_ALIAS_LENGTH + $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='%{$terminfo[bold]$fg[${(L)color}]%}' - (( count = $count + 1 )) - done - PR_NO_COLOUR="%{$terminfo[sgr0]%}" - - ### - # Modify Git prompt - ZSH_THEME_GIT_PROMPT_PREFIX=" $PR_YELLOW" - 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[yellow]%} π§" - ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%} -" - ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[magenta]%} β" - ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[blue]%} β" - 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 - - PR_TITLEBAR=$'%{\e]0;zsh\a%}' - - ### - # 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_RED$PR_ULCORNER$PR_HBAR moo \ -$PR_YELLOW%$PR_PWDLEN<...<%~%<< \ -`rvm_prompt_info || rbenv_prompt_info`$PR_GREEN$PR_HBAR$PR_HBAR${(e)PR_FILLBAR}β[\ -$PR_MAGENTA$USER_ALIAS$PR_GREEN@$PR_MAGENTA%m:%l\ -$PR_GREEN]$PR_GREEN$PR_HBAR$PR_URCORNER\ - -$PR_REDβ°β%{$reset_color%}`git_prompt_info``git_prompt_status`\ -$PR_RED Μ£Ε $PR_NO_COLOUR' - - # display exitcode on the right when >0 - return_code="%(?..%{$fg[yellow]%}%? β΅%{$reset_color%})" - RPROMPT=' $return_code\ -$PR_GREEN [$PR_MAGENTA%D{%d. %b %Y %H:%M:%S}$PR_GREEN]$PR_HBAR$PR_GREEN$PR_LRCORNER$PR_NO_COLOUR' - - PS2='$PR_BLUE$PR_HBAR\ -$PR_BLUE$PR_HBAR(\ -$PR_LIGHT_GREEN%_$PR_BLUE)$PR_HBAR\ -$PR_CYAN$PR_HBAR$PR_NO_COLOUR ' -} - -setprompt - -autoload -U add-zsh-hook -add-zsh-hook precmd theme_precmd -add-zsh-hook preexec theme_preexec - -fortune | cowsay | lolcat -S 56 diff --git a/shell_only.sh b/shell_only.sh index 7736d07..f96f488 100644 --- a/shell_only.sh +++ b/shell_only.sh @@ -33,8 +33,5 @@ sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/too ln -s ${PWD}/bin ~/bin -mkdir -p ~/.oh-my-zsh/themes -ln -s ${PWD}/himbeer.zsh-theme ~/.oh-my-zsh/themes/himbeer.zsh-theme - mkdir -p ~/ ln -s ${PWD}/zshrc ~/.zshrc @@ -1,6 +1,6 @@ export ZSH="$HOME/.oh-my-zsh" export PATH="$HOME/go/bin:$HOME/bin:/usr/local/go/bin:$PATH" export TERM="xterm-256color" -ZSH_THEME="himbeer" +ZSH_THEME="smt" plugins=(git) source $ZSH/oh-my-zsh.sh |