From 870ab7c9beffc791285dc7aa0e87b2e10ffb6b42 Mon Sep 17 00:00:00 2001 From: Justin Hileman Date: Sat, 2 May 2020 09:19:56 -0700 Subject: [PATCH] Fix some edge cases when nerd fonts are on and powerline fonts are explicitly disabled. --- fish_prompt.fish | 2 +- fish_right_prompt.fish | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fish_prompt.fish b/fish_prompt.fish index 504ed2c..6ce9052 100644 --- a/fish_prompt.fish +++ b/fish_prompt.fish @@ -393,7 +393,7 @@ function __bobthefish_finish_segments -S -d 'Close open prompt segments' if set -q theme_newline_prompt echo -ens "$theme_newline_prompt" - else if [ "$theme_powerline_fonts" = "no" ] + else if [ "$theme_powerline_fonts" = "no" -a "$theme_nerd_fonts" != "yes" ] echo -ns '> ' else echo -ns "$right_arrow_glyph " diff --git a/fish_right_prompt.fish b/fish_right_prompt.fish index c9e2c7a..bd6ee94 100644 --- a/fish_right_prompt.fish +++ b/fish_right_prompt.fish @@ -68,7 +68,7 @@ end function fish_right_prompt -d 'bobthefish is all about the right prompt' set -l __bobthefish_left_arrow_glyph \uE0B3 - if [ "$theme_powerline_fonts" = "no" ] + if [ "$theme_powerline_fonts" = "no" -a "$theme_nerd_fonts" != "yes" ] set __bobthefish_left_arrow_glyph '<' end