feat: don't use hydro, roll your own

Author: macintacos

managed/dot_config/fish/user/prompt.fish

@@ -1,17 +1,70 @@
-# Greeting
-
 function fish_greeting
     fish_logo
 end
 
-# Prompt
-set hydro_color_pwd green -d
-set hydro_color_git brblack
-set hydro_color_prompt brblack
-
-# Tide
-set --universal tide_left_prompt_items pwd git
-set --universal tide_left_prompt_suffix " \$"
-set --universal tide_git_icon ""
-set --universal tide_pwd_color_dirs normal
-set --universal tide_pwd_color_anchors normal
+# track when commands actually execute
+function __my_prompt_preexec --on-event fish_preexec
+    set -g __my_prompt_cmd_executed 1
+end
+
+function __my_prompt_postexec --on-event fish_postexec
+    set -g __my_prompt_last_status $status
+end
+
+function fish_prompt
+    # capture previous command status IMMEDIATELY - must be first
+    set -l last_status $status
+
+    # cache git prompt setup once
+    if not set -q __my_prompt_git_inited
+        set -g __fish_git_prompt_showdirtystate 1
+        set -g __fish_git_prompt_showuntrackedfiles 0
+        set -g __fish_git_prompt_showcolorhints 0
+        set -g __fish_git_prompt_char_stateseparator ''  # stick "*" to branch
+        set -g __my_prompt_git_inited 1
+    end
+
+    # line 1: cwd + gray annotations
+    set_color $fish_color_cwd
+    printf '%s' (prompt_pwd)
+    set_color normal
+
+    # git branch without parentheses
+    set -l git_seg (fish_git_prompt "%s")
+
+    # duration from CMD_DURATION: ms; switch to seconds >= 1000ms
+    set -l dur_ms $CMD_DURATION
+    set -l dur_str $dur_ms"ms"
+    if test $dur_ms -ge 1000
+        set dur_str (math -s 1 "$dur_ms/1000")"s"
+    end
+
+    # build annotations: [branch?] <dur> | [status?]
+    set -l parts
+    if test -n "$git_seg"
+        set parts $parts $git_seg
+    end
+    set parts $parts $dur_str
+
+    # only show status if a command was actually executed and failed
+    if set -q __my_prompt_cmd_executed; and test $last_status -ne 0
+        set parts $parts " $last_status"
+    else
+        set parts $parts ""
+    end
+
+    # clear the command executed flag
+    set -e __my_prompt_cmd_executed
+
+    if test (count $parts) -gt 0
+        printf ' '
+        set_color brblack
+        printf '%s' (string join ' ' -- $parts)
+        set_color normal
+    end
+    printf '\n'
+
+    # line 2: prompt char only
+    printf '$ '
+end
+

managed/dot_config/fish/user/vi.fish

@@ -19,19 +19,15 @@ function fish_mode_prompt
             case default
                 set vi_mode_color (set_color --reverse magenta)
                 set vi_mode_symbol N
-                __fish_cursor_xterm block # WORKAROUND
             case insert
                 set vi_mode_color (set_color --reverse green)
                 set vi_mode_symbol I
-                __fish_cursor_xterm line # WORKAROUND
             case replace replace_one
                 set vi_mode_color (set_color --reverse red)
                 set vi_mode_symbol R
-                __fish_cursor_xterm underscore # WORKAROUND
             case visual
                 set vi_mode_color (set_color --reverse cyan)
                 set vi_mode_symbol V
-                __fish_cursor_xterm block # WORKAROUND
         end
         string unescape "$vi_mode_color $vi_mode_symbol \x1b[0m "
     end