From addd768bc39de1e830bffa448a45de63a277e444 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Sat, 13 Apr 2024 14:43:31 +0200
Subject: [PATCH] fish: update prompt

---
 fish/functions/fish_prompt.fish  | 31 +++++++++++++++++++++++++++++++
 fish/functions/prompt_login.fish |  4 +---
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 fish/functions/fish_prompt.fish

diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
new file mode 100644
index 0000000..4cd8f76
--- /dev/null
+++ b/fish/functions/fish_prompt.fish
@@ -0,0 +1,31 @@
+function fish_prompt --description 'Write out the prompt'
+    set -l last_pipestatus $pipestatus
+    set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
+    set -l normal (set_color normal)
+    set -q fish_color_status
+    or set -g fish_color_status red
+
+    # Color the prompt differently when we're root
+    set -l color_cwd $fish_color_cwd
+    set -l suffix '>'
+    if functions -q fish_is_root_user; and fish_is_root_user
+        if set -q fish_color_cwd_root
+            set color_cwd $fish_color_cwd_root
+        end
+        set suffix '#'
+    end
+
+    # Write pipestatus
+    # If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it.
+    set -l bold_flag --bold
+    set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
+    if test $__fish_prompt_status_generation = $status_generation
+        set bold_flag
+    end
+    set __fish_prompt_status_generation $status_generation
+    set -l status_color (set_color $fish_color_status)
+    set -l statusb_color (set_color $bold_flag $fish_color_status)
+    set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
+
+    echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " " $prompt_status $suffix " "
+end
diff --git a/fish/functions/prompt_login.fish b/fish/functions/prompt_login.fish
index 5ca4c24..c8b6703 100644
--- a/fish/functions/prompt_login.fish
+++ b/fish/functions/prompt_login.fish
@@ -21,8 +21,6 @@ function prompt_login --description 'display user name for the prompt'
     # If we're running via SSH, change the host color.
     set -l color_host $fish_color_host
     if set -q SSH_TTY; and set -q fish_color_host_remote
-        set color_host $fish_color_host_remote
+        echo -n -s (set_color $fish_color_user) "$USER" (set_color normal) / (set_color $color_host) (prompt_hostname) (set_color normal)
     end
-
-    echo -n -s (set_color $fish_color_user) "$USER" (set_color normal) / (set_color $color_host) (prompt_hostname) (set_color normal)
 end