Merge pull request 'feat: Use two line fish prompt' (#21) from ui/fish into main

Reviewed-on: #21

fish/functions/fish_prompt.fish

@@ -40,39 +40,54 @@ end
 
 function fish_prompt
 #	set_color white
-#	echo -n '['
+#	printf '['
 
 	set -l FishStatusCodeCache $status
 
-	set_color -o 00FF00
+	set_color -o 00FF00 -b 333333
-	echo -n (whoami)
+	printf (whoami)
 
 	set_color normal
-	echo -n '@'
+	set_color -b 333333
+	printf '@'
 
 	set_color AFD75F
-	echo -n (prompt_hostname)
+	printf (prompt_hostname)
 
 	set_color white
-	echo -n ':'
+	printf ':'
 
 	set_color 8787FF
-	echo -n (prompt_abbr $PWD)
+	printf (prompt_abbr $PWD)
 
-	set_color 5F87D7
+	set -l vcs_prompt (fish_vcs_prompt)
-	echo -n (__fish_vcs_prompt)
+	if test -n "$vcs_prompt"
+		printf " "
+		set_color 5F87D7
+		printf '\uf126'
+		printf (fish_vcs_prompt)
+	end
 
 	if test $FishStatusCodeCache -eq 0
 		#set_color 18C412
 	else
 		set_color E84505
-		echo -n " [$FishStatusCodeCache]"
+		printf " [$FishStatusCodeCache]"
 	end
 
 #	set_color white
-#	echo -n "]"
+#	printf "]"
 
-	set_color -o white
+	set_color 999999
-	echo -n "> "
+	printf " "
+	printf (date '+%Y/%m/%d %H:%M:%S')
+	printf "\n"
+
+	#set_color -o white
+	#printf "> "
+
+	set_color normal
+	set_color -o green
+	printf "⮀ "
 	set_color normal
 end

fish/functions/fish_right_prompt.fish

@@ -1,8 +0,0 @@
-#!/bin/fish
-
-function fish_right_prompt
-	set_color grey
-	printf (date '+%H:%M:%S')
-	set_color normal
-end
-