Новая тема

2019-10-17 14:30:04 +05:00 · 2019-10-17 14:30:04 +05:00 · ab63e47075
commit ab63e47075
parent 1556ee0394
5 changed files with 83 additions and 47 deletions
--- a/zsh/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/zsh/plugins/git-prompt/git-prompt.plugin.zsh
@ -1,3 +1,6 @@
+# ZSH Git Prompt Plugin from:
+# http://github.com/olivierverdier/zsh-git-prompt
+
 __GIT_PROMPT_DIR="${0:A:h}"

 ## Hook function definitions
@ -39,6 +42,7 @@ function update_current_git_vars() {
    GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5]
    GIT_CHANGED=$__CURRENT_GIT_STATUS[6]
    GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
+    GIT_DELETED=$__CURRENT_GIT_STATUS[8]
 }

 git_super_status() {
@ -53,7 +57,7 @@ git_super_status() {
      fi
      STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR"
      if [ "$GIT_STAGED" -ne "0" ]; then
-          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}"
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SEPARATOR"
      fi
      if [ "$GIT_CONFLICTS" -ne "0" ]; then
          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}"
@ -61,8 +65,11 @@ git_super_status() {
      if [ "$GIT_CHANGED" -ne "0" ]; then
          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
      fi
+      if [ "$GIT_DELETED" -ne "0" ]; then
+        STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_DELETED$GIT_DELETED%{${reset_color}%}"
+      fi
      if [ "$GIT_UNTRACKED" -ne "0" ]; then
-          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}"
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED$GIT_UNTRACKED%{${reset_color}%}"
      fi
      if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then
          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN"
@ -84,6 +91,7 @@ ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
 ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}-"

 # Set the prompt.
 RPROMPT='$(git_super_status)'
--- a/zsh/plugins/git-prompt/gitstatus.py
+++ b/zsh/plugins/git-prompt/gitstatus.py
@ -1,7 +1,6 @@
 #!/usr/bin/env python
 from __future__ import print_function

-import os
 import sys
 import re
 import shlex
@ -23,7 +22,7 @@ def get_tagname_or_hash():
        tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1]

    if tagname:
-        return tagname.replace(' ', '')
+        return tagname
    elif hash_:
        return hash_
    return None
@ -31,18 +30,18 @@ def get_tagname_or_hash():

 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
-po = Popen(['git', 'status', '--porcelain', '--branch'], env=dict(os.environ, LANG="C"), stdout=PIPE, stderr=PIPE)
+po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE)
 stdout, sterr = po.communicate()
 if po.returncode != 0:
    sys.exit(0)  # Not a git repository

 # collect git status information
-untracked, staged, changed, conflicts = [], [], [], []
+untracked, staged, changed, conflicts, deleted = [], [], [], [], []
 ahead, behind = 0, 0
 status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()]
 for st in status:
    if st[0] == '#' and st[1] == '#':
-        if re.search('Initial commit on', st[2]) or re.search('No commits yet on', st[2]):
+        if re.search('Initial commit on', st[2]):
            branch = st[2].split(' ')[-1]
        elif re.search('no branch', st[2]):  # detached status
            branch = get_tagname_or_hash()
@ -68,6 +67,8 @@ for st in status:
    else:
        if st[1] == 'M':
            changed.append(st)
+        if st[1] == 'D':
+            deleted.append(st)
        if st[0] == 'U':
            conflicts.append(st)
        elif st[0] != ' ':
@ -81,5 +82,6 @@ out = ' '.join([
    str(len(conflicts)),
    str(len(changed)),
    str(len(untracked)),
+    str(len(deleted)),
 ])
 print(out, end='')
--- a/zsh/themes/eof.zsh-theme
+++ b/zsh/themes/eof.zsh-theme
@ -1,24 +1,38 @@
-# Depends on the git plugin for work_in_progress()
+# Depends on the git-prompt plugin

+# Colors: black red green yellow blue magenta cyan white
+# Symbols: … ● ✔ ✖ ↓ ↑ ➜ ☀ ♻ ⚒
+
+# git-prompt customization
 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=""
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[green]%}]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_SEPARATOR=" "
+ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[green]%}"
+ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[white]%}%{⚒%G%}"
+ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
+ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[yellow]%}%{☀%G%}"
+ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
+ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[blue]%}%{?%G%}"
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}%{✔%G%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}♻"

-#Customized git status, oh-my-zsh currently does not allow render dirty status before branch
-git_custom_status() {
-  local cb=$(git_current_branch)
-  if [ -n "$cb" ]; then
-    echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
-  fi
-}
+# Default mode (Small)
+#ZSH_THEME_EOF_NAMES="${USER%%@*}@%m"

-# RVM component of prompt
-ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}["
-ZSH_THEME_RUBY_PROMPT_SUFFIX="]%{$reset_color%}"
+case $ZSH_THEME_EOF_MODE in
+  mega)
+    ZSH_THEME_EOF_NAMES="%n@%M "
+    ;;
+  big)
+    ZSH_THEME_EOF_NAMES="%n@%m "
+    ;;
+  small)
+    ZSH_THEME_EOF_NAMES="${USER%%@*}@%m "
+    ;;
+  tiny|*)
+    ZSH_THEME_EOF_NAMES=""
+    ;;
+esac

-# Combine it all into a final right-side prompt
-RPS1='$(git_custom_status)$(ruby_prompt_info) $EPS1'
-
-#PROMPT='%B%{$fg[green]%}%n@%m%b %{$fg[cyan]%}%~% %(?.%{$fg[green]%}.%{$fg[red]%})%B%#%b '
-PROMPT='%{$fg[green]%}[%B%{$fg[green]%}%n@%m%b %{$fg[cyan]%}%~% %{$fg[green]%}]%(?.%{$fg[green]%}.%{$fg[red]%})%B%#%b '
+PROMPT='%{$fg[green]%}[%B%{$fg[green]%}$ZSH_THEME_EOF_NAMES%b%{$fg[cyan]%}%~% %{$fg[green]%}]%(?.%{$fg[green]%}.%{$fg[red]%})%B%#%b '
--- a/zsh/themes/wedisagree.zsh-theme
+++ b/zsh/themes/wedisagree.zsh-theme
@ -5,9 +5,9 @@
 # - Place that bundle in ~/Library/Application\ Support/SIMBL/Plugins (create that folder if it doesn't exist)
 # - Open Terminal preferences. Go to Settings -> Text -> More
 # - Change default colours to your liking.
-# 
+#
 # Here are the colours from Textmate's Monokai theme:
-# 
+#
 # Black: 0, 0, 0
 # Red: 229, 34, 34
 # Green: 166, 227, 45
@ -25,35 +25,36 @@ PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'

 # The right-hand prompt

-RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
+RPROMPT='$(git_super_status)%{$reset_color%}'

 # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
-# $(ruby_prompt_info) 
+# %{$fg[yellow]%}$(~/.rvm/bin/rvm-prompt)%{$reset_color%}

 # local time, color coded by last return code
 time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
 time_disabled="%{$fg[green]%}%*%{$reset_color%}"
 time=$time_enabled

-ZSH_THEME_GIT_PROMPT_PREFIX=" ☁  %{$fg[red]%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%} ⑃ " # ☁
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%} ☂" # Ⓓ
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ✭" # ⓣ
-ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ☀" # Ⓞ
+ZSH_THEME_GIT_PROMPT_DIRTY="" # Ⓓ ☂ %{$fg[yellow]%} ☶
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%} ?" # ⓣ ✭
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔" # Ⓞ ☀

-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_STAGED="%{$fg[green]%} +" # ⓐ ⑃
+ZSH_THEME_GIT_PROMPT_CHANGED="%{$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_AHEAD="%{$fg[blue]%} 𝝙"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[red]%} ♒" # ⓤ ⑊
+ZSH_THEME_GIT_PROMPT_AHEAD="%{$fg[yellow]%} ⩲"
+ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[yellow]%} ⩱"
+ZSH_THEME_GIT_PROMPT_SEPARATOR=" \\"

-ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[yellow]%}"
-ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_BRANCH="%{%}"

 # More symbols to choose from:
 # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
-# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵  ⩶ ⨠ 
+# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵  ⩶ ⨠
 # ⬅ ⬆ ⬇ ⬈ ⬉ ⬊ ⬋ ⬒ ⬓ ⬔ ⬕ ⬖ ⬗ ⬘ ⬙ ⬟  ⬤ 〒 ǀ ǁ ǂ ĭ Ť Ŧ

 # Determine if we are using a gemset.
@ -61,7 +62,7 @@ function rvm_gemset() {
    GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
    if [[ -n $GEMSET ]]; then
        echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
-    fi 
+    fi
 }

 # Determine the time since last commit. If branch is clean,
@ -78,12 +79,12 @@ function git_time_since_commit() {
            # Totals
            MINUTES=$((seconds_since_last_commit / 60))
            HOURS=$((seconds_since_last_commit/3600))
-           
+
            # Sub-hours and sub-minutes
            DAYS=$((seconds_since_last_commit / 86400))
            SUB_HOURS=$((HOURS % 24))
            SUB_MINUTES=$((MINUTES % 60))
-            
+
            if [[ -n $(git status -s 2> /dev/null) ]]; then
                if [ "$MINUTES" -gt 30 ]; then
                    COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
--- a/zsh/zshrc
+++ b/zsh/zshrc
@ -10,6 +10,17 @@ export ZSH=$HOME/.dots/zsh
 # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
 ZSH_THEME="eof"

+# Setup eof theme mode
+# [mega|big|small|tiny]
+#ZSH_THEME_EOF_MODE="small"
+
+# Auto setup eof theme mode
+if [[ -n "$TMUX" ]]; then
+  ZSH_THEME_EOF_MODE="tiny"
+else
+  ZSH_THEME_EOF_MODE="small"
+fi
+
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
 # a theme from this variable instead of looking in ~/.oh-my-zsh/themes/
@ -24,7 +35,7 @@ ZSH_THEME="eof"
 # HYPHEN_INSENSITIVE="true"

 # Uncomment the following line to disable bi-weekly auto-update checks.
-# DISABLE_AUTO_UPDATE="true"
+DISABLE_AUTO_UPDATE="true"

 # Uncomment the following line to automatically update without prompting.
 # DISABLE_UPDATE_PROMPT="true"
@ -68,7 +79,7 @@ ZSH_THEME="eof"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git themes common-aliases)
+plugins=(git themes common-aliases git-prompt)

 source $ZSH/oh-my-zsh.sh