From 6655251240466c456478d43cf0fbf485b0b19f0b Mon Sep 17 00:00:00 2001 From: Matt Hamilton Date: Tue, 15 Dec 2015 22:19:11 -0500 Subject: [PATCH] fix symlink, not sure how they broke --- modules/prompt/functions/prompt_eriner_setup | 145 +------------------ modules/prompt/functions/prompt_steeef_setup | 101 +------------ 2 files changed, 2 insertions(+), 244 deletions(-) mode change 100644 => 120000 modules/prompt/functions/prompt_eriner_setup mode change 100644 => 120000 modules/prompt/functions/prompt_steeef_setup diff --git a/modules/prompt/functions/prompt_eriner_setup b/modules/prompt/functions/prompt_eriner_setup deleted file mode 100644 index 2d7bb94..0000000 --- a/modules/prompt/functions/prompt_eriner_setup +++ /dev/null @@ -1,144 +0,0 @@ -# Eriner's Theme - fork of agnoster -# A Powerline-inspired theme for ZSH -# -# # README -# -# In order for this theme to render correctly, you will need a -# [Powerline-patched font](https://gist.github.com/1595572). -# -# # Goals -# -# The aim of this theme is to only show you *relevant* information. Like most -# prompts, it will only show git information when in a git working directory. -# However, it goes a step further: everything from the current user and -# hostname to whether the last call exited with an error to whether background -# jobs are running in this shell will all be displayed automatically when -# appropriate. - -### Segment drawing -# A few utility functions to make it easy and re-usable to draw segmented prompts - -CURRENT_BG='NONE' -PRIMARY_FG=black - -# Characters -SEGMENT_SEPARATOR="\ue0b0" -PLUSMINUS="\u00b1" -BRANCH="\ue0a0" -DETACHED="\u27a6" -CROSS="\u2718" -LIGHTNING="\u26a1" -GEAR="\u2699" - -# Begin a segment -# Takes two arguments, background and foreground. Both can be omitted, -# rendering default background/foreground. -prompt_segment() { - local bg fg - [[ -n ${1} ]] && bg="%K{${1}}" || bg="%k" - [[ -n ${2} ]] && fg="%F{${2}}" || fg="%f" - if [[ $CURRENT_BG != 'NONE' && ${1} != $CURRENT_BG ]]; then - print -n "%{${bg}%F{${CURRENT_BG}}%}${SEGMENT_SEPARATOR}%{${fg}%}" - else - print -n "%{${bg}%}%{${fg}%}" - fi - CURRENT_BG=${1} - [[ -n ${3} ]] && print -n ${3} -} - -# End the prompt, closing any open segments -prompt_end() { - if [[ -n $CURRENT_BG ]]; then - print -n "%{%k%F{${CURRENT_BG}}%}${SEGMENT_SEPARATOR}" - else - print -n "%{%k%}" - fi - print -n "%{%f%}" - CURRENT_BG='' -} - -### Prompt components -# Each component will draw itself, and hide itself if no information needs to be shown - -# Context: user@hostname (who am I and where am I) -prompt_context() { - if [[ ${USERNAME} != ${DEFAULT_USER} || -n ${SSH_CONNECTION} ]]; then - prompt_segment ${PRIMARY_FG} default " %(!.%{%F{yellow}%}.)${USERNAME}@%m " - fi -} - -# Git: branch/detached head, dirty status -prompt_git() { - local color ref - is_dirty() { - test -n "$(git status --porcelain --ignore-submodules)" - } - ref=${vcs_info_msg_0_} - if [[ -n ${ref} ]]; then - if is_dirty; then - color=yellow - ref="${ref} ${PLUSMINUS}" - else - color=green - ref="${ref} " - fi - if [[ "${ref/.../}" == ${ref} ]]; then - ref="${BRANCH} ${ref}" - else - ref="$DETACHED ${ref/.../}" - fi - prompt_segment ${color} ${PRIMARY_FG} - print -Pn " ${ref}" - fi -} - -# Dir: current working directory -prompt_dir() { - prompt_segment cyan ${PRIMARY_FG} ' %~ ' -} - -# Status: -# - was there an error -# - am I root -# - are there background jobs? -prompt_status() { - local symbols - symbols=() - [[ ${RETVAL} -ne 0 ]] && symbols+="%{%F{red}%}${CROSS}" - [[ ${UID} -eq 0 ]] && symbols+="%{%F{yellow}%}${LIGHTNING}" - [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}${GEAR}" - - [[ -n ${symbols} ]] && prompt_segment ${PRIMARY_FG} default " ${symbols} " -} - -## Main prompt -prompt_agnoster_main() { - RETVAL=$? - CURRENT_BG='NONE' - prompt_status - prompt_context - prompt_dir - prompt_git - prompt_end -} - -prompt_agnoster_precmd() { - vcs_info - PROMPT='%{%f%b%k%}$(prompt_agnoster_main) ' -} - -prompt_agnoster_setup() { - autoload -Uz add-zsh-hook - autoload -Uz vcs_info - - prompt_opts=(cr subst percent) - - add-zsh-hook precmd prompt_agnoster_precmd - - zstyle ':vcs_info:*' enable git - zstyle ':vcs_info:*' check-for-changes false - zstyle ':vcs_info:git*' formats '%b' - zstyle ':vcs_info:git*' actionformats '%b (%a)' -} - -prompt_agnoster_setup "$@" diff --git a/modules/prompt/functions/prompt_eriner_setup b/modules/prompt/functions/prompt_eriner_setup new file mode 120000 index 0000000..d727475 --- /dev/null +++ b/modules/prompt/functions/prompt_eriner_setup @@ -0,0 +1 @@ +../themes/eriner.zsh-theme \ No newline at end of file diff --git a/modules/prompt/functions/prompt_steeef_setup b/modules/prompt/functions/prompt_steeef_setup deleted file mode 100644 index 8f0db50..0000000 --- a/modules/prompt/functions/prompt_steeef_setup +++ /dev/null @@ -1,100 +0,0 @@ -# prompt style and colors based on Steve Losh's Prose theme: -# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme -# -# vcs_info modifications from Bart Trojanowski's zsh prompt: -# http://www.jukie.net/bart/blog/pimping-out-zsh-prompt -# -# git untracked files modification from Brian Carper: -# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt - -export VIRTUAL_ENV_DISABLE_PROMPT=1 - -function virtualenv_info { - [ $VIRTUAL_ENV ] && print '('%F{blue}`basename $VIRTUAL_ENV`%f') ' -} -PR_GIT_UPDATE=1 - -setopt prompt_subst - -autoload -U add-zsh-hook -autoload -Uz vcs_info - -#use extended color pallete if available -if [[ $terminfo[colors] -ge 256 ]]; then - turquoise="%F{81}" - orange="%F{166}" - purple="%F{135}" - hotpink="%F{161}" - limegreen="%F{118}" -else - turquoise="%F{cyan}" - orange="%F{yellow}" - purple="%F{magenta}" - hotpink="%F{red}" - limegreen="%F{green}" -fi - -# enable VCS systems you use -zstyle ':vcs_info:*' enable git svn - -# check-for-changes can be really slow. -# you should disable it, if you work with large repositories -zstyle ':vcs_info:*:prompt:*' check-for-changes true - -# set formats -# %b - branchname -# %u - unstagedstr (see below) -# %c - stagedstr (see below) -# %a - action (e.g. rebase-i) -# %R - repository path -# %S - path in the repository -PR_RST="%f" -FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})" -FMT_ACTION="(%{$limegreen%}%a${PR_RST})" -FMT_UNSTAGED="%{$orange%}●" -FMT_STAGED="%{$limegreen%}●" - -zstyle ':vcs_info:*:prompt:*' unstagedstr "${FMT_UNSTAGED}" -zstyle ':vcs_info:*:prompt:*' stagedstr "${FMT_STAGED}" -zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}" -zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH}" -zstyle ':vcs_info:*:prompt:*' nvcsformats "" - - -function steeef_preexec { - case "$(history $HISTCMD)" in - *git*) - PR_GIT_UPDATE=1 - ;; - *svn*) - PR_GIT_UPDATE=1 - ;; - esac -} -add-zsh-hook preexec steeef_preexec - -function steeef_chpwd { - PR_GIT_UPDATE=1 -} -add-zsh-hook chpwd steeef_chpwd - -function steeef_precmd { - if [[ -n "$PR_GIT_UPDATE" ]] ; then - # check for untracked files or updated submodules, since vcs_info doesn't - if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then - PR_GIT_UPDATE=1 - FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})" - else - FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})" - fi - zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH} " - - vcs_info 'prompt' - PR_GIT_UPDATE= - fi -} -add-zsh-hook precmd steeef_precmd - -PROMPT=$' -%{$purple%}%n${PR_RST} at %{$orange%}%m${PR_RST} in %{$limegreen%}%~${PR_RST} $vcs_info_msg_0_$(virtualenv_info) -$ ' diff --git a/modules/prompt/functions/prompt_steeef_setup b/modules/prompt/functions/prompt_steeef_setup new file mode 120000 index 0000000..c2abe5e --- /dev/null +++ b/modules/prompt/functions/prompt_steeef_setup @@ -0,0 +1 @@ +../themes/steeef.zsh-theme \ No newline at end of file