Merge bf5d22f541 into 291e96dcd0

.gitignore

@@ -1,8 +1,43 @@
-# custom files
-custom/
-!custom/plugins/example
-!custom/example.zsh
-
-# temp files directories
-cache/
-log/
+.DS_Store
+vim/bundle/*
+vim/sessions/*
+vim/.netrwhist
+vim/vundle_plugins/custom
+vim/.backup/*
+vim/.tmp/*
+vim/.temp/*
+vim/.backup/*
+vim/.undo/*
+bash/ssh.sh
+bin/php*
+config/configstore/update-notifier-nodemon.json
+vim/.spell/custom.en.utf-8.add.spl
+emacs/*.elc
+emacs/\#*
+emacs/bookmarks
+emacs/backup
+emacs/backup.*
+emacs/org-clock-save.el
+emacs/ac-comphist.dat
+emacs/tramp
+emacs/elpa
+emacs/var
+emacs/eshell
+emacs/ido.last
+emacs/recentf
+emacs/.cask
+emacs/emms
+emacs/url
+emacs/auto-save-list
+emacs/projectile-bookmarks.eld
+emacs/projectile.cache
+emacs/saveplace
+emacs/projectile.cache
+emacs/projectile-bookmarks.eld
+emacs/ac-comphist.dat
+emacs/auto-save-list
+emacs/games
+config/configstore/snyk.json
+config/git/gitk
+config/vifm/vifminfo
+vim/vim

plugins/git/git.plugin.zsh

@@ -227,10 +227,7 @@ alias gstl='git stash list'
 alias gstp='git stash pop'
 alias gsts='git stash show --text'
 alias gsu='git submodule update'
-
-alias gts='git tag -s'
 alias gtv='git tag | sort -V'
-
 alias gunignore='git update-index --no-assume-unchanged'
 alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
 alias gup='git pull --rebase'

themes/ultra.zsh-theme

@@ -0,0 +1,20 @@
+function prompt_char {
+    git branch >/dev/null 2>/dev/null && echo '±' && return
+    echo '○'
+}
+
+function virtualenv_info {
+    [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
+}
+
+PROMPT='%{$fg[blue]%}✿ %{$reset_color%}[%m]-[${PWD/#$HOME/~}] $(prompt_char) %{$reset_color%}$(git_prompt_info) %{$fg[green]%}➜ %{$reset_color%} '
+
+ZSH_THEME_GIT_PROMPT_PREFIX="|%{$fg[green]%}"
+
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}|"
+
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}[✹]%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[green]%}?%{$reset_color%}"
+
+ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%}(⦿)%{$reset_color%}"