fix trailing spaces in path and a few other things gemini caught when throwing it the output of fish_trace 1

Author: paulirish

.aliases

@@ -59,7 +59,6 @@ alias wget="curl -O"
 alias cleanup_dsstore="find . -name '*.DS_Store' -type f -ls -delete"
 
 alias diskspace_report="df --si /"
-alias free_diskspace_report="diskspace_report"
 
 # Shortcuts
 alias g="git"

.bash_profile

@@ -8,8 +8,8 @@ setupPATH() {
     if [ -d "$P" ]; then
         export PATH="$PATH:$P"
     fi
-    # read these files but strip out comments and newlines.
-    done < <(tac ~/.paths ~/.paths.local 2> /dev/null | sed 's|#.*||')
+    #subread these files but strip out comments, extra whitespace, and empty lines
+    done < <(tac ~/.paths ~/.paths.local 2> /dev/null | sed 's|#.*||' | sed 's/^[ \t]*//;s/[ \t]*$//' | sed '/^$/d')
 }
 setupPATH;
 
@@ -40,6 +40,12 @@ export LESS_TERMCAP_so=$'\E[38;5;246m'    # begin standout-mode - info box
 export LESS_TERMCAP_ue=$'\E[0m'           # end underline
 export LESS_TERMCAP_us=$'\E[04;38;5;146m' # begin underline
 
+
+# Skip line-numbers and grid. https://github.com/sharkdp/bat/blob/e608b331425ca2ce8f8d0bd37e7f90901f91eb99/src/style.rs#L27-L61
+# In the future this can be `default,-numbers,-grid` but they haven't released in 18months so.....   
+export BAT_STYLE="changes,header-filename,header-filesize,snip,rule"
+
+
 ##
 ## HISTORY settings... 
 ##

.exports

@@ -37,10 +37,6 @@ export FZF_DEFAULT_COMMAND='fd'
 export FZF_CTRL_T_COMMAND='fd'
 export FZF_CTRL_T_OPTS="--preview 'bat -n --color=always {} 2>/dev/null || tree -C {}'"
 
-# Skip line-numbers and grid. https://github.com/sharkdp/bat/blob/e608b331425ca2ce8f8d0bd37e7f90901f91eb99/src/style.rs#L27-L61
-# In the future this can be `default,-numbers,-grid` but they haven't released in 18months so.....   
-export BAT_STYLE="changes,header-filename,header-filesize,snip,rule"
-
 
 export CLOUDSDK_PYTHON=/usr/bin/python3
 

fish/aliases.fish

@@ -35,7 +35,9 @@ abbr bwre brew
 abbr brwe brew
 
 abbr cat 'bat -P'
-set -x BAT_STYLE "header,header-filesize,header-filename,changes"
+# Skip line-numbers and grid. https://github.com/sharkdp/bat/blob/e608b331425ca2ce8f8d0bd37e7f90901f91eb99/src/style.rs#L27-L61
+# In the future this can be `default,-numbers,-grid` but they haven't released in 18months so.....   
+set -x BAT_STYLE "changes,header-filename,header-filesize,snip,rule"
 
 alias push="git push"
 
@@ -117,7 +119,6 @@ alias sorteduniq-asc="sort | uniq -c | sort --ignore-leading-blanks --numeric-so
 
 
 alias diskspace_report="df --si /"
-alias free_diskspace_report="diskspace_report"
 
 
 alias hosts='sudo $EDITOR /etc/hosts'   # yes I occasionally 127.0.0.1 twitter.com ;)

fish/config.fish

@@ -2,12 +2,15 @@
 # todo, investigate later.
 # status stack-trace
 
-#   upfront add homebrew stuff to path
 
+# Debugging 
 # set fish_trace 1
+# fish_trace 1 outputs 3,500 lines when spawning a fresh shell.
+
 # /Users/paulirish/.homebrew/bin/fish --debug "*" # super noisy
-# see `fish --print-debug-categories`
-# /Users/paulirish/.homebrew/bin/fish --debug "abbrs ast-construction char-encoding complete config debug env-dispatch env-export env-locale error event exec exec-fork exec-job-exec exec-job-status fd-monitor history history-file iothread output-invalid path proc-internal-proc proc-job-run proc-pgroup proc-reap-external proc-reap-internal proc-termowner profile-history reader reader-render screen term-support topic-monitor uvar-file uvar-notifier warning warning-path" 
+#    see `fish --print-debug-categories`
+# fish --debug "$(fish --print-debug-categories | grep -v "ast-construction" | sed 's| .*||' | string join ',')"
+#     ^ outputs 11,400 lines of spawning a fresh shell
 
 function fish_greeting
 end
@@ -27,15 +30,13 @@ function ssource --description "source most of my dotfiles, useful if making cha
         source ../private/extras.fish
     end
 
-    # for things not checked into git..
+    # for things not checked into git
     if test -e "$HOME/.extra.fish";
         source ~/.extra.fish
     end
 end
 
 
-fish_add_path $HOME/.homebrew/bin; fish_add_path $HOME/homebrew/bin; # so i can use utils in startup
-
 ssource;
 
 # I don't need a prompt symbol for you-got-things-in-yr-stash
@@ -95,8 +96,6 @@ set __fish_git_prompt_color_dirtystate 'red'
 set __fish_git_prompt_color_upstream_ahead ffb90f
 set __fish_git_prompt_color_upstream_behind blue
 
-# Local prompt customization
-set -e fish_greeting
 
 
 set -g fish_pager_color_completion normal
@@ -105,13 +104,6 @@ set -g fish_pager_color_prefix cyan
 set -g fish_pager_color_progress cyan
 
 
-# ctrl-b invokes the fancy boi. but this doesnt really work right.
-bind \cb git-recent-with-fzf-and-diff
-if bind -M insert > /dev/null 2>&1
-    bind -M insert \cb git-recent-with-fzf-and-diff
-end
-
-
 
 string match -q "$TERM_PROGRAM" "vscode"
 and . (code --locate-shell-integration-path fish)

fish/functions.fish

@@ -206,6 +206,13 @@ function conda -d 'lazy initialize conda'
   conda $argv
 end
 
+
+function cargo -d 'lazy initialize cargo'
+  functions --erase cargo
+  sh "$HOME/.cargo/env"
+  cargo $argv
+end
+
 # NVM doesnt support fish and its stupid to try to make it work there.