From 94a3ad358ed49780955e0515642adfa39bef7e15 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Fri, 21 Apr 2017 13:19:50 -0700 Subject: [PATCH] Make fish prompt overridable --- .../default/fish/functions/fish_right_prompt.fish | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/assets/default/fish/functions/fish_right_prompt.fish b/assets/default/fish/functions/fish_right_prompt.fish index dd3f723..a8fe9a0 100644 --- a/assets/default/fish/functions/fish_right_prompt.fish +++ b/assets/default/fish/functions/fish_right_prompt.fish @@ -1,5 +1,3 @@ -# TODO: Eventually... make pluggable so plugins can add to prompt - # This is exported because the venv is now included here set -xg VIRTUAL_ENV_DISABLE_PROMPT 1 @@ -9,17 +7,22 @@ set -xg VIRTUAL_ENV_DISABLE_PROMPT 1 function _force_target if [ (git config force.use) ] set -l org (force-target) - echo " [$org]" + echo "[$org]" end end function _virtual_env if [ $VIRTUAL_ENV ] set -l venv (basename "$VIRTUAL_ENV") - echo " [$venv]" + echo "[$venv]" end end +function _right_prompt_aux + # To override use `funced _fish_right_prompt_user; and funcsave _fish_right_prompt_user` + functions -q _fish_right_prompt_user; and _fish_right_prompt_user +end + function fish_right_prompt set -l cyan (set_color -o cyan) set -l yellow (set_color -o yellow) @@ -28,6 +31,6 @@ function fish_right_prompt set -l green (set_color -o green) set -l normal (set_color normal) - echo -n $green (_force_target) (_virtual_env) + echo -n $green (_force_target) (_virtual_env) (_right_prompt_aux) set_color normal end