From 2e44a77b43bca28d3815c96395053c4f53a09e19 Mon Sep 17 00:00:00 2001
From: Abra <a@abra.me>
Date: Sun, 18 Dec 2016 12:12:01 +0400
Subject: [PATCH] new prompt

---
 .../prompt/functions/prompt_abra_setup        | 47 +++++++++++++++----
 .zprezto/runcoms/zalias                       |  8 ++--
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/.zprezto/modules/prompt/functions/prompt_abra_setup b/.zprezto/modules/prompt/functions/prompt_abra_setup
index 51b94bd..1632463 100644
--- a/.zprezto/modules/prompt/functions/prompt_abra_setup
+++ b/.zprezto/modules/prompt/functions/prompt_abra_setup
@@ -1,13 +1,38 @@
 pmodload 'helper'
 
+# %F{color}...%f -- foreground colors
+# %B...%b -- bold
+# %(x.a.b) -- if
+
+# color chart: https://upload.wikimedia.org/wikipedia/en/1/15/Xterm_256color_chart.svg
+COLOR_PWD='141'
+COLOR_PWD_ROOT='201'
+COLOR_PROMPT_STARTER='85'
+COLOR_TIME='244'
+COLOR_USERNAME='34'
+COLOR_AT='244'
+COLOR_HOSTNAME='162'
+
+NEWLINE=$'\n'
+
 function prompt_abra_precmd {
   setopt LOCAL_OPTIONS
   unsetopt XTRACE KSH_ARRAYS
 
   # Get Git repository information.
-  if (( $+functions[git-info] )); then
+  if [[ -z $NOGIT ]] && (( $+functions[git-info] )); then
+    git-info on
     git-info
+  else
+    git-info off
   fi
+
+  PRE_LENGTH=$(($COLUMNS*2/3))
+
+  PRE='%$PRE_LENGTH<...<%~ %<<'
+  PRE=$(print -P $PRE)
+  PRE=$(print ${(l:$COLUMNS:)PRE})
+  print -P '%(!.%F{$COLOR_PWD_ROOT}.%F{$COLOR_PWD})$PRE%f'
 }
 
 function prompt_abra_setup {
@@ -21,10 +46,6 @@ function prompt_abra_setup {
   # Add hook for calling git-info before each command.
   add-zsh-hook precmd prompt_abra_precmd
 
-  # Set editor-info parameters.
-  zstyle ':prezto:module:editor:info:completing' format '%B%F{red}......%f%b'
-  zstyle ':prezto:module:editor:info:keymap:primary' format ' %B%(?:%F{green}➤%f:%F{red}➤%f)%b'
-
   # Set git-info parameters.
   zstyle ':prezto:module:git:info' verbose 'yes'
   zstyle ':prezto:module:git:info:action' format ':%%B%F{yellow}%s%f%%b'
@@ -41,12 +62,22 @@ function prompt_abra_setup {
   zstyle ':prezto:module:git:info:unmerged' format ' %%B%F{yellow}═%f%%b'
   zstyle ':prezto:module:git:info:untracked' format ' %%B%F{white}◼%f%%b'
   zstyle ':prezto:module:git:info:keys' format \
-    'prompt' ' $(coalesce "%b" "%p" "%c")%s' \
+    'prompt' '%b ' \
     'rprompt' '%A%B%S%a%d%m%r%U%u'
 
 
-  PROMPT='%F{cyan}%3~%f${git_info:+${(e)git_info[prompt]}}%(!. %B%F{red}#%f%b.)${editor_info[keymap]}  '
-  RPROMPT='%(?::%F{red}%?%f )%B%F{green}%n@%2m%f%b${git_info[rprompt]} %F{blue}%*%f'
+
+  PROMPT=''
+  PROMPT=$PROMPT'${git_info:+${(e)git_info[prompt]}}'
+  PROMPT=$PROMPT'%(?.%F{$COLOR_PROMPT_STARTER}.%F{red})➤ %f'
+
+  RPROMPT=''
+  RPROMPT=$RPROMPT'%(?::%F{red}%?%f )' # last command code if nonzero
+  RPROMPT=$RPROMPT'%B%F{$COLOR_USERNAME}%n%f%b'
+  RPROMPT=$RPROMPT'%B%F{$COLOR_AT}@%f%b'
+  RPROMPT=$RPROMPT'%B%F{$COLOR_HOSTNAME}%2m%f%b'
+  RPROMPT=$RPROMPT'${git_info[rprompt]} '
+  RPROMPT=$RPROMPT'%F{$COLOR_TIME}%*%f'
 }
 
 prompt_abra_setup "$@"
diff --git a/.zprezto/runcoms/zalias b/.zprezto/runcoms/zalias
index 32d4523..c447a02 100644
--- a/.zprezto/runcoms/zalias
+++ b/.zprezto/runcoms/zalias
@@ -24,6 +24,7 @@ alias zshreload="exec zsh"
 alias tarc="tar cvzf"
 alias rcp="rsync --partial --progress --append --rsh=ssh -r -h"
 alias rmv="rsync --partial --progress --append --rsh=ssh -r -h --remove-sent-files"
+alias rsyncc="rsync -rzPhc"
 
 alias pythonserve="sudo python -m SimpleHTTPServer 80"
 
@@ -35,11 +36,12 @@ alias clbin="curl -F 'clbin=<-' https://clbin.com"
 #alias afs="unmount-abra0; mount-abra0;"
 
 alias .g='git --git-dir=$HOME/.dotgit/ --work-tree=$HOME'
-alias .s='.g status -uno'
+alias .gs='.g status -uno'
 alias .gp='.g commit -am "auto" && .g push'
-alias .sg='git --git-dir=/var/www/git.abra.me/dot.git --work-tree=$HOME'
 
-alias dus="du -hd0 * | gsort -h"
+alias dus="du -kHhd0 * | gsort -h"
+
+alias p="perl -pe"
 
 #alias f1sql="/google/data/ro/projects/storage/f1/tools/f1-sql"