From dd31f8bba1fbc8f8d34d420674ecef88dd642add Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Thu, 23 Feb 2023 20:52:50 +0200
Subject: [PATCH] fish: better handle prompt_sep being disabled

---
 cli/.config/fish/conf.d/prompt.fish        |  2 +-
 cli/.config/fish/functions/prompt.add.fish | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cli/.config/fish/conf.d/prompt.fish b/cli/.config/fish/conf.d/prompt.fish
index b563d1e..d8b9314 100644
--- a/cli/.config/fish/conf.d/prompt.fish
+++ b/cli/.config/fish/conf.d/prompt.fish
@@ -1,4 +1,4 @@
-set prompt_sep_a \ue0b0
+set prompt_sep \ue0b0
 set prompt_bang \n\ (set_color brblue)\u266a\ 
 set git_sign \ue0a0
 set color_fg brwhite
diff --git a/cli/.config/fish/functions/prompt.add.fish b/cli/.config/fish/functions/prompt.add.fish
index 1b79daa..5da49fa 100644
--- a/cli/.config/fish/functions/prompt.add.fish
+++ b/cli/.config/fish/functions/prompt.add.fish
@@ -1,10 +1,14 @@
 function prompt.add
-    set color $argv[1]
-    set text $argv[2]
+    set -l color $argv[1]
+    set -l text $argv[2]
+    set -l sep ''
+    if test -n "$prompt_sep"
+        set sep (set_color $prev_color)$prompt_sep(set_color $color_fg)
+        set prev_color $color
+    end
     if test -z "$prompt_string"
         set prompt_string (set_color -b $color)(set_color $color_fg) $text
     else
-        set -a prompt_string (set_color -b $color)(set_color $prev_color)$prompt_sep_a(set_color $color_fg) $text
+        set -a prompt_string (set_color -b $color)$sep $text
     end
-    set prev_color $color
 end