From 73fd5571232b7854b27511dae13126d799db1ec5 Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Thu, 20 Nov 2014 23:58:23 +0300 Subject: [PATCH 1/5] bobthefish: added promt support for virtualfish --- themes/bobthefish/fish_prompt.fish | 40 ++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/themes/bobthefish/fish_prompt.fish b/themes/bobthefish/fish_prompt.fish index b6a5413..965cc6e 100644 --- a/themes/bobthefish/fish_prompt.fish +++ b/themes/bobthefish/fish_prompt.fish @@ -32,6 +32,11 @@ set __bobthefish_nonzero_exit_glyph '! ' set __bobthefish_superuser_glyph '$ ' set __bobthefish_bg_job_glyph '% ' +# Python glyphs +set __bobthefish_superscript \u00B1 \u00B2 \u00B3 +set __bobthefish_virtualenv_glyph \u25F0 +set __bobthefish_pypy \u1D56 + # Colors set __bobthefish_lt_green addc10 set __bobthefish_med_green 189303 @@ -50,6 +55,10 @@ set __bobthefish_dk_grey 333 set __bobthefish_med_grey 999 set __bobthefish_lt_grey ccc +set __bobthefish_dk_brown 4d2600 +set __bobthefish_med_brown 803F00 +set __bobthefish_lt_brown BF5E00 + # =========================== # Helper methods # =========================== @@ -249,6 +258,34 @@ function __bobthefish_prompt_dir -d 'Display a shortened form of the current dir __bobthefish_path_segment "$PWD" end +function __bobthefish_in_virtualfish_virtualenv + set -q VIRTUAL_ENV +end + +function __bobthefish_virtualenv_python_version -d 'Get current python version' + switch (readlink (which python)) + case python2 + echo $__bobthefish_superscript[2] + case python3 + echo $__bobthefish_superscript[3] + case pypy + echo $__bobthefish_pypy + end +end + +function __bobthefish_virtualenv -d 'Get the current virtualenv' + echo $__bobthefish_virtualenv_glyph(__bobthefish_virtualenv_python_version) (basename "$VIRTUAL_ENV") +end + +function __bobthefish_promt_virtualfish -d "Display activated virtual environment (only for virtualfish, virtualenv's activate.fish changes promt by itself)" + set flag_bg $__bobthefish_lt_brown + set flag_fg $__bobthefish_dk_brown + __bobthefish_start_segment $flag_bg $flag_fg + set_color $flag_fg --bold + echo -n -s (__bobthefish_virtualenv) $flags ' ' + set_color normal +end + # =========================== # Apply theme @@ -263,5 +300,8 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome' else __bobthefish_prompt_dir end + if __bobthefish_in_virtualfish_virtualenv + __bobthefish_promt_virtualfish + end __bobthefish_finish_segments end From 86a3979079ba8c28e1ba2a355000d12fb1620bc1 Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Fri, 21 Nov 2014 00:24:29 +0300 Subject: [PATCH 2/5] bobthefish: virtualfish: move at the front --- themes/bobthefish/fish_prompt.fish | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/themes/bobthefish/fish_prompt.fish b/themes/bobthefish/fish_prompt.fish index 965cc6e..365cc0b 100644 --- a/themes/bobthefish/fish_prompt.fish +++ b/themes/bobthefish/fish_prompt.fish @@ -33,9 +33,9 @@ set __bobthefish_superuser_glyph '$ ' set __bobthefish_bg_job_glyph '% ' # Python glyphs -set __bobthefish_superscript \u00B1 \u00B2 \u00B3 +set __bobthefish_superscript_glyph \u00B1 \u00B2 \u00B3 set __bobthefish_virtualenv_glyph \u25F0 -set __bobthefish_pypy \u1D56 +set __bobthefish_pypy_glyph \u1D56 # Colors set __bobthefish_lt_green addc10 @@ -265,11 +265,11 @@ end function __bobthefish_virtualenv_python_version -d 'Get current python version' switch (readlink (which python)) case python2 - echo $__bobthefish_superscript[2] + echo $__bobthefish_superscript_glyph[2] case python3 - echo $__bobthefish_superscript[3] + echo $__bobthefish_superscript_glyph[3] case pypy - echo $__bobthefish_pypy + echo $__bobthefish_pypy_glyph end end @@ -295,13 +295,13 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome' set -g RETVAL $status __bobthefish_prompt_status __bobthefish_prompt_user + if __bobthefish_in_virtualfish_virtualenv + __bobthefish_promt_virtualfish + end if __bobthefish_in_git __bobthefish_prompt_git else __bobthefish_prompt_dir end - if __bobthefish_in_virtualfish_virtualenv - __bobthefish_promt_virtualfish - end __bobthefish_finish_segments end From cd7e57d0986d88b079b4560544a18bf39081ebba Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Fri, 21 Nov 2014 00:34:45 +0300 Subject: [PATCH 3/5] bobthefish: virtualfish: fix superscript --- themes/bobthefish/fish_prompt.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/bobthefish/fish_prompt.fish b/themes/bobthefish/fish_prompt.fish index 365cc0b..7518f0e 100644 --- a/themes/bobthefish/fish_prompt.fish +++ b/themes/bobthefish/fish_prompt.fish @@ -33,7 +33,7 @@ set __bobthefish_superuser_glyph '$ ' set __bobthefish_bg_job_glyph '% ' # Python glyphs -set __bobthefish_superscript_glyph \u00B1 \u00B2 \u00B3 +set __bobthefish_superscript_glyph \u00B9 \u00B2 \u00B3 set __bobthefish_virtualenv_glyph \u25F0 set __bobthefish_pypy_glyph \u1D56 From c3a0da82d380b1e2d4ad560f6402f29669397581 Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Fri, 21 Nov 2014 00:45:15 +0300 Subject: [PATCH 4/5] bobthefish: virtualfish: change color to blue --- themes/bobthefish/fish_prompt.fish | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/themes/bobthefish/fish_prompt.fish b/themes/bobthefish/fish_prompt.fish index 7518f0e..c9962d5 100644 --- a/themes/bobthefish/fish_prompt.fish +++ b/themes/bobthefish/fish_prompt.fish @@ -59,6 +59,10 @@ set __bobthefish_dk_brown 4d2600 set __bobthefish_med_brown 803F00 set __bobthefish_lt_brown BF5E00 +set __bobthefish_dk_blue 1E2933 +set __bobthefish_med_blue 275379 +set __bobthefish_lt_blue 326D9E + # =========================== # Helper methods # =========================== @@ -278,8 +282,8 @@ function __bobthefish_virtualenv -d 'Get the current virtualenv' end function __bobthefish_promt_virtualfish -d "Display activated virtual environment (only for virtualfish, virtualenv's activate.fish changes promt by itself)" - set flag_bg $__bobthefish_lt_brown - set flag_fg $__bobthefish_dk_brown + set flag_bg $__bobthefish_lt_blue + set flag_fg $__bobthefish_dk_blue __bobthefish_start_segment $flag_bg $flag_fg set_color $flag_fg --bold echo -n -s (__bobthefish_virtualenv) $flags ' ' From abc77d80d209f8d7058a1676eae26b870065a7cb Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Fri, 21 Nov 2014 00:55:52 +0300 Subject: [PATCH 5/5] bobthefish: virtualfish: fix typo --- themes/bobthefish/fish_prompt.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/bobthefish/fish_prompt.fish b/themes/bobthefish/fish_prompt.fish index c9962d5..1aeebf9 100644 --- a/themes/bobthefish/fish_prompt.fish +++ b/themes/bobthefish/fish_prompt.fish @@ -281,7 +281,7 @@ function __bobthefish_virtualenv -d 'Get the current virtualenv' echo $__bobthefish_virtualenv_glyph(__bobthefish_virtualenv_python_version) (basename "$VIRTUAL_ENV") end -function __bobthefish_promt_virtualfish -d "Display activated virtual environment (only for virtualfish, virtualenv's activate.fish changes promt by itself)" +function __bobthefish_prompt_virtualfish -d "Display activated virtual environment (only for virtualfish, virtualenv's activate.fish changes prompt by itself)" set flag_bg $__bobthefish_lt_blue set flag_fg $__bobthefish_dk_blue __bobthefish_start_segment $flag_bg $flag_fg @@ -300,7 +300,7 @@ function fish_prompt -d 'bobthefish, a fish theme optimized for awesome' __bobthefish_prompt_status __bobthefish_prompt_user if __bobthefish_in_virtualfish_virtualenv - __bobthefish_promt_virtualfish + __bobthefish_prompt_virtualfish end if __bobthefish_in_git __bobthefish_prompt_git