Merge pull request #230 from mr-mustash/u/pking/20250312_fish_updates_part_2

Fish 4.0 Update

Author: mr-mustash

tilde/.config/fish/config.fish

@@ -2,32 +2,31 @@ if status is-interactive
     # Colors
     source "$__fish_config_dir/colors.fish"
 
-    # Adding my prompt configs first
+    # Key bindings
+    test -e $__fish_config_dir/function/fish_user_key_bindings.fish; and set fish_key_bindings fish_user_key_bindings
+
+    # Load custom prompt directory
     set -gx fish_function_path $__fish_config_dir/prompt/prompt_functions/ $fish_function_path
     set -gx fish_function_path $__fish_config_dir/prompt/ $fish_function_path
     set -gx async_prompt_functions __fish_prompt_git __fish_prompt_screen __fish_prompt_jobs __fish_right_prompt_github_user
     set -gx async_prompt_inherit_variables status pipestatus SHLVL CMD_DURATION fish_bind_mode __wall_clock_time_pre __wall_clock_time_post
     set -gx async_prompt_internal_signal SIGUSR3
 
-
-    # Separate directory for shims that --wrap commands
+    # Load shims that `--wrap` commands
     set -gx fish_function_path $__fish_config_dir/shims/ $fish_function_path
 
-    # Key bindings
-    test -e $__fish_config_dir/function/fish_user_key_bindings.fish; and set fish_key_bindings fish_user_key_bindings
+    # Source event handlers
+    set -gx fish_function_path $__fish_config_dir/event_handlers $fish_function_path
+    for event_function in $__fish_config_dir/event_handlers/*.fish
+        source $event_function
+    end
 
     # Add private scripts to the function path
     set -gx fish_function_path $__fish_config_dir/private/ $fish_function_path
     if test -e $__fish_config_dir/private/private_env.fish
         source $__fish_config_dir/private/private_env.fish
     end
 
-    # Add event handlers to the function path and source them
-    set -gx fish_function_path $__fish_config_dir/event_handlers $fish_function_path
-    for event_function in $__fish_config_dir/event_handlers/*.fish
-        source $event_function
-    end
-
 else
     set -gx fish_function_path $__fish_config_dir/prompt/prompt_functions/ $fish_function_path
     set -gx fish_function_path $__fish_config_dir/prompt/ $fish_function_path

tilde/.config/fish/event_handlers/__fish_dirchanged_update_file_list.fish

@@ -1,3 +1,3 @@
-function __fish_dirchanged_update_file_list --on-variable PWD --description "Update the current file list on a directory change"
-    set -g __dir_file_list (command ls -1a)
-end
+#function __fish_dirchanged_update_file_list --on-variable PWD --description "Update the current file list on a directory change"
+#    set -g __dir_file_list (command ls -1a)
+#end

tilde/.config/fish/event_handlers/__fish_on_variable_pwd.fish

@@ -0,0 +1,3 @@
+function __fish_on_variable_pwd --on-variable PWD --description "Recalculate dir string when directory changes"
+    set -e __fish_prompt_pwd_string
+end

tilde/.config/fish/prompt/fish_prompt.fish

@@ -2,14 +2,12 @@ function fish_prompt --description 'Write out the prompt'
     __fish_prompt_username
     __fish_prompt_hostname
     __fish_prompt_pwd
-
-    # TODO: __fish_prompt_pwd_graveyard still show graveyard files for subdirectories
     #__fish_prompt_pwd_graveyard
 
     __fish_prompt_git
 
-    __fish_prompt_languages
-    __fish_prompt_jobs
+    #__fish_prompt_languages
+    #__fish_prompt_jobs
     __fish_prompt_screen
 
     # Change the color of the glyph based on vi mode
@@ -18,14 +16,11 @@ function fish_prompt --description 'Write out the prompt'
             # bryellow is equal to grey???
             set fish_color_prompt bryellow --bold
         case insert
-            # This is different than the yellow that I use
-            # for Vim but it's much more aestheticlaly pleasing.
             set fish_color_prompt $fish_color_user
         case visual
             set fish_color_prompt magenta --bold
     end
 
     set -l glyph "❯"
     echo -ns (set_color $fish_color_prompt) " $glyph " (set_color normal)
-
 end

tilde/.config/fish/prompt/prompt_functions/__fish_prompt_pwd.fish

@@ -1,29 +1,60 @@
 function __fish_prompt_pwd --description 'Format the current directory for the prompt'
-    set -l max (math "round($COLUMNS / 8)") # maximum length = 1/8rd window width
+    if not set -q __fish_prompt_pwd_string
+        # Avoid repeated string operations by using a more direct approach
+        set -l path_str
+        if string match -q "$HOME/*" "$PWD"
+            set path_str "~"(string sub -s (math 1 + (string length "$HOME")) "$PWD")
+        else if test "$PWD" = "$HOME"
+            set path_str "~"
+        else
+            set path_str "$PWD"
+        end
 
-    set -l short_path (pwd | string replace -r ".*/" "") # basename of current dir
-    set -l short_path_length (string length $short_path)
+        # Calculate max length
+        set -l max (math "round($COLUMNS/6)")
 
-    # if basename of $PWD is too long by itself, don't trim it
-    if test $max -lt $short_path_length
-        set max $short_path_length
-    end
+        # Quick return for short paths
+        if test (string length -- $path_str) -le $max
+            echo -ns (set_color $fish_color_cwd --bold) $path_str (set_color normal)
+            return
+        end
+
+        # Split path into components only once
+        set -l components (string split / $path_str)
+        set -l num_components (count $components)
+        set -l truncated
+        set -l current_len 0
+        set -l i $num_components
+
+        # Process components from end until we hit length limit
+        while test $i -gt 0
+            set -l component $components[$i]
+            set -l component_len (string length -- $component)
+
+            # Add 1 for the slash unless it's the first component
+            if test -n "$truncated"
+                set component_len (math $component_len + 1)
+            end
 
-    # tilde-ify homedir
-    set -l long_path (pwd | string replace -r "^$HOME" "~")
+            if test (math $current_len + $component_len) -gt $max
+                break
+            end
 
-    # is $PWD too long, and if so, by how much?
-    set -l long_path_length (string length $long_path)
-    set -l excess (math "round($long_path_length - $max)")
+            if test -n "$truncated"
+                set truncated "$component/$truncated"
+            else
+                set truncated $component
+            end
 
-    if test $excess -gt 0
-        # cut to $max chars long, trim leading detritus and add leader
-        set cut_path (string sub --start "$excess" "$long_path")
-        set path_parts (string split --max=1 / "{$cut_path")
-        set trimmed_path $path_parts[2]
+            set current_len (math $current_len + $component_len)
+            set i (math $i - 1)
+        end
 
-        set long_path "…/$trimmed_path"
+        # Add ellipsis if we didn't use all components
+        if test $i -gt 0
+            set __fish_prompt_pwd_string "…/$truncated"
+        end
     end
 
-    echo -ns (set_color $fish_color_cwd --bold) $long_path (set_color normal)
+    echo -ns (set_color $fish_color_cwd --bold) $__fish_prompt_pwd_string (set_color normal)
 end

tilde/.config/fish/prompt/prompt_functions/__fish_prompt_pwd_graveyard.fish

@@ -1,37 +1,25 @@
 function __fish_prompt_pwd_graveyard --description 'Are there files in the pwd that are in the `rip` graveyard?'
-    if in-path rip
-        set -l __rip_graveyard_files (rip -s 2>/dev/null)
-        if test $status -ne 0 -o (count $__rip_graveyard_files) -eq 0
-            return
-        end
+    # Early return if no GRAVEYARD variable
+    set -q GRAVEYARD || return
 
-        # This whole statement is here because if you call `rip -s` it'll recurse
-        # through every directory and see if there is a file in the graveyard.
-        # Here I am checking to see if there is a file in the graveyard exists
-        # in the current directory and not in any subdirectories.
+    # Cache graveyard files
+    set -l __rip_graveyard_files (rip -s 2>/dev/null) || return
+    test (count $__rip_graveyard_files) -eq 0 && return
 
-        # First, find the graveyard location.
-        set -l _whoami (whoami)
-        if set -q GRAVEYARD
-            set _graveyard (echo $GRAVEYARD | string escape --style=regex | sed -e "s.\/.\\\/.g")
-        else
-            set _graveyard (\/tmp\/graveyard-$_whoami\/)
-        end
+    # Get current path
+    set -l pwd $PWD
+    set -l pwd_p (pwd -P)
 
-        # Now, find if the current directory is in the graveyard.
-        contains -i (pwd -L) (dirname (rip -s | sed -e "s/$_graveyard//")) >/dev/null \
-            || contains -i (pwd -P) (dirname (rip -s | sed -e "s/$_graveyard//")) >/dev/null
-        if test $status -eq 0
-            set __fish_prompt_pwd_has_graveyard 0
-        else
-            return
-        end
+    # Prepare graveyard path regex once
+    set -l _graveyard (string escape --style=regex -- $GRAVEYARD)
 
-        if test $__fish_prompt_pwd_has_graveyard -eq 0
-            echo -ns (set_color normal) "("
-            echo -ns (set_color $fish_prompt_color_graveyard) "" (set_color normal)
-            echo -ns ")"
+    # Process files in batch where possible
+    for file in $__rip_graveyard_files
+        # Do string operations only once per iteration
+        set -l file_dir (dirname (string replace -r "^$_graveyard" "" $file))
+        if test "$file_dir" = "$pwd" -o "$file_dir" = "$pwd_p"
+            echo -ns (set_color normal)"("(set_color $fish_prompt_color_graveyard)""(set_color normal)")"
+            return
         end
     end
-
 end

tilde/.config/fish/prompt/prompt_functions/__fish_prompt_screen.fish

@@ -1,15 +1,16 @@
 function __fish_prompt_screen --description 'Helper function for fish_prompt'
-    # Yes this grep could be nicer, but it's easier to just have both the
-    # single and plural options.
-    set -l screen_count (command screen -ls | egrep -v 'Socket|Sockets|There is a screen|There are screens|^[[:space:]]*$' | wc -l)
-    if test $screen_count = 0
+    if not set -q __screen_session_count
+        set -g __screen_session_count (command screen -ls | egrep -v 'Socket|Sockets|There is a screen|There are screens|^[[:space:]]*$' | wc -l)
+    end
+
+    if test $__screen_session_count = 0
         return
     end
 
     set -l sty (echo $STY)
     if test -n "$sty"
-        echo -ns (set_color $fish_prompt_color_in_screen) " 󰊓 " (set_color normal) $screen_count (set_color normal)
+        echo -ns (set_color $fish_prompt_color_in_screen) " 󰊓 " (set_color normal) $__screen_session_count (set_color normal)
     else
-        echo -ns (set_color $fish_prompt_color_screen) " 󰊓 " (set_color normal) $screen_count (set_color normal)
+        echo -ns (set_color $fish_prompt_color_screen) " 󰊓 " (set_color normal) $__screen_session_count (set_color normal)
     end
 end

tilde/.config/fish/shims/screen.fish

@@ -1,8 +1,4 @@
 function screen --wraps screen -d "Make screen more useful by asking what to connect to."
-    if status is-interactive
-        command screen $argv
-        if test $status -ne 0
-            echo "Fix this function."
-        end
-    end
+    set -e __screen_session_count
+    command screen $argv
 end