Merge remote-tracking branch 'refs/remotes/origin/main'

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

@@ -2,14 +2,14 @@
 
 # PATH setup via ~/.paths
 setupPATH() {
-    # Credit to https://github.com/davidaurelio/dotfiles/blob/main/.profile for the technique of resolving $variables
+    # Credit to https://github.com/davidaurelio/dotfiles/blob/main/.profile this cute pattern.
     while read -r P; do
     P=`eval echo $P`
     if [ -d "$P" ]; then
         export PATH="$PATH:$P"
     fi
-    # read these files but strip out comments and newlines.
-    done < <(cat ~/.paths ~/.paths.local 2> /dev/null | grep -v "^#")
+    #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

@@ -24,9 +24,6 @@ export LESS_TERMCAP_so=$(printf '\e[01;33m')													# enter standout mode 
 export LESS_TERMCAP_ue=$(printf '\e[0m')															# leave underline mode
 export LESS_TERMCAP_us=$(printf '\e[04;36m')													# enter underline mode – cyan
 
-# I'll also make sure my `man grep` uses the right one
-export MANPATH="$HOME/.homebrew/opt/gnu-sed/libexec/gnubin:$HOME/homebrew/opt/gnu-sed/libexec/gnubin:$MANPATH";
-
 
 # fzf should be populated via `fd` which is the fastest file/dir finder. (respects gitignore, etc)
 # note.. `fd` seems faster than `ag`.. but if i wanted to use `ag` this is good: command ag --files-with-matches --filename-pattern ""
@@ -37,10 +34,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
 

.functions

@@ -24,17 +24,7 @@ whichlink() {
 }
 
 
-# git commit browser. needs fzf. ctrl-m to view commit.
-log() {
-  git log --graph --color=always \
-      --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$@" |
-  fzf --ansi --no-sort --reverse --tiebreak=index --toggle-sort=\` \
-      --bind "ctrl-m:execute:
-                echo '{}' | grep -o '[a-f0-9]\{7\}' | head -1 |
-                xargs -I % sh -c 'git show --color=always % | less -R'"
-}
-
-#make two beeps
+# make two beeps. 
 beep() { 
   echo -e '\a'; sleep 0.1; echo -e '\a';
 }
@@ -152,10 +142,6 @@ webmify(){
 	ffmpeg -i "$1" -vcodec libvpx -acodec libvorbis -isync -copyts -aq 80 -threads 3 -qmax 30 -y "$2" "$1.webm"
 }
 
-# direct it all to /dev/null
-function nullify() {
-  "$@" >/dev/null 2>&1
-}
 
 # `shellswitch [bash |zsh]`
 #   Must be in /etc/shells

.gitignore

@@ -10,4 +10,12 @@ PAUL.readme.md
 node_modules
 
 # why u be like that
-.DS_Store
+.DS_Store
+
+
+.aider.chat.history.md
+.aider.input.history
+.aider.tags.cache.v4
+
+.gemini
+.roo

fish/aliases.fish

@@ -36,7 +36,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"
 
@@ -118,7 +120,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 ;)
@@ -138,15 +139,6 @@ alias cleanup_dsstore="find . -name '*.DS_Store' -type f -ls -delete"
 
 alias ungz="gunzip -k"
 
-# File size
-alias fs="stat -f \"%z bytes\""
-
-# emptytrash written as a function
-
-# Update installed Ruby gems, Homebrew, npm, and their installed packages
-alias brew_update="brew -v update; brew upgrade --force-bottle --cleanup; brew cleanup; brew cask cleanup; brew prune; brew doctor; npm-check -g -u"
-alias update_brew_npm_gem='brew_update; npm install npm -g; npm update -g; sudo gem update --system; sudo gem update --no-document'
-
 
 function gemi
   # using https://github.com/simonw/llm-gemini and llm
@@ -156,9 +148,9 @@ function gemi
   #    gemi "tell me a joke"
   if test -z "$argv[1]"
     # no markdown parsing here without some real fancy stuff. because you dont want to send to markdown renderer (glow) inbetween backticks, etc.
-    llm chat --continue -m gemini-2.0-flash-exp
+    llm chat --continue -m gemini-2.5-flash
   else
-    llm prompt -m gemini-2.0-flash-exp "$argv" && echo "⬇️… and now rendered…⬇️" && llm logs -r | glow
+    llm prompt -m gemini-2.5-flash "$argv" && echo "⬇️… and now rendered…⬇️" && llm logs -r | glow
   end
 end
 

fish/chromium.fish

@@ -206,7 +206,7 @@ end
 
 
 # dt. rpp
-alias rppunit 'npm test -- --skip-ninja front_end/panels/timeline/ front_end/models/trace front_end/ui/legacy/components/perf_ui front_end/models/cpu_profile front_end/services/trace_bounds'
+alias rppunit 'npm test -- --skip-ninja front_end/panels/timeline/ front_end/models/trace front_end/ui/legacy/components/perf_ui front_end/models/cpu_profile front_end/services/trace_bounds front_end/models/ai_assistance/'
 alias rppunit-debug 'npm test -- front_end/panels/timeline/ front_end/models/trace front_end/ui/legacy/components/perf_ui --debug'
 alias rppinter 'npm run test -- test/e2e/performance/'
 alias rppe2e 'npm run test -- test/e2e/performance/'
@@ -225,15 +225,15 @@ function rbu  --description "rebase-update with extra steps"
 
     # _watch_suspend
 
-    git checkout origin/main && git cl archive -f --verbose && git rebase-update && git checkout -b main origin/main && \
+    git checkout origin/main && git cl archive --force --verbose && git rebase-update && git checkout -b main origin/main && \
     git checkout main && depshooks && \
     git checkout "$current_branch_name"
 
     # _watch_resume
 end
 
 function rebasecontinue   --description "continuing after resolving rebase conflicts mid-rebase-update"
-    GIT_EDITOR=true git rebase --continue; git rebase-update -n && git checkout -b main origin/main &&  git checkout main && depshooks
+    GIT_EDITOR=true git rebase --continue; git rebase-update --no-fetch && git checkout -b main origin/main &&  git checkout main && depshooks
 end
 
 
@@ -254,9 +254,7 @@ end
 alias upload 'git cl format --js && git status --porcelain=v2 && git cl upload'
 
 abbr gcert 'gcert-local'
+# copy a diff-looking thing (like our karma diffs) to clipboard and this'll run em through delta.  Could be improved for multiline strings but.. requires lotta lines.
+abbr deltapb 'printf "%s\n" "@@ -1,1 +1,1 @@" (pbpaste) | delta --max-line-length 1024 --minus-style "white #2b0000" --plus-style "white #001900"'
 
-function clstatus --description "pick a branch that is on gerrit as a CL"
-  set -l branch_name (git cl status --no-branch-color --date-order | awk '/ : / {print $0}' | fzf | awk '{print $1}')
-  git checkout $branch_name
-end
 

fish/config.fish

@@ -1,18 +1,22 @@
-# I've noticed this file gets called multiple times. 
+# I've noticed this file gets called multiple times. (not on mbp)
 # 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
 
-# TODO: path and aliases are kinda slow to source. optimize later.
+# TODO: path and aliases are kinda slow to source. optimize later. 
 function ssource --description "source most of my dotfiles, useful if making changes and iterating"
 
     source ~/.config/fish/path.fish
@@ -23,19 +27,17 @@ function ssource --description "source most of my dotfiles, useful if making cha
     # pull in all shared `export …` aka `set -gx …`
     source ~/.exports
 
-    if test -e "../private/extras.fish";
-        source ../private/extras.fish
+    if test -e "$HOME/code/dotfiles/private/extras.fish";
+        source $HOME/code/dotfiles/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 +97,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 +105,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

@@ -1,4 +1,3 @@
-# thx to https://github.com/mduvall/config/
 
 function subl --description 'Open Sublime Text'
   if test -d "/Applications/Sublime Text.app"
@@ -87,21 +86,19 @@ end
 
 function all_binaries_in_path --description \
   "list all binaries available in \$PATH (incl conflicts). pipe it to grep. top-most are what's used, in case of conflicts"
-  # based on https://unix.stackexchange.com/a/120790/110766 but tweaked to work on mac. and then made it faster.
-  find -L $PATH -maxdepth 1 -executable -type f 2>/dev/null
+  # based on https://unix.stackexchange.com/a/120790/110766. and then made it faster. needs `brew install findutils`
+  gfind -L $PATH -maxdepth 1 -executable -type f 2>/dev/null
+end
 
-  # list path
-  # for val in $PATH; echo "$val"; end
+function all_binaries_in_path_grep --description "run all_binaries_in_path and grep with your argument"
+  all_binaries_in_path | grep $argv
 end
 
-function list_path --description "list all paths in PATH"
+function list_path --description "list all paths in PATH, top-most wins"
   for val in $PATH; echo "$val"; end
 end
 
-function my_paths --description "list paths, in order"
-  echo "#  "
-  printf '%s\n' (string split \n $PATH)
-end
+
 
 function stab --description "stabalize a video"
   set -l vid $argv[1]
@@ -199,25 +196,34 @@ function server -d 'Start a HTTP server in the current dir, optionally specifyin
     end
 end
 
+# straight from the docs 
+function last_history_item
+    echo $history[1]
+end
+abbr -a !! --position anywhere --function last_history_item
+
 
-function conda -d 'lazy initialize conda'
-  functions --erase conda
-  eval /opt/miniconda3/bin/conda "shell.fish" "hook" | source
-  # There's some opportunity to use `psub` but I don't really understand it.
-  conda $argv
+# I crafted this lazy init pattern. It's lovely.
+# I first did it with functions but it's better with abbr to get completions etc immediately.
+function __lazy_init_conda -d 'lazy initialize conda'
+  abbr --erase conda; functions --erase __lazy_init_conda
+  eval $(which conda) "shell.fish" "hook" | source
+  echo "conda"
 end
+abbr --add conda --function __lazy_init_conda
+
+
+function __lazy_init_cargo -d 'lazy initialize cargo'
+  abbr --erase cargo; functions --erase __lazy_init_cargo
+  sh "$HOME/.cargo/env"
+  echo "cargo"
+end
+abbr --add cargo --function __lazy_init_cargo
 
 # NVM doesnt support fish and its stupid to try to make it work there.
+# gcloud: Don't need "$HOME/google-cloud-sdk/path.fish.inc" lazyily done because it only adds to PATH which is already done.
 
 
-function google_cloud_sdk_lazy_init -d 'Lazy initializer for Google Cloud SDK'
-  functions --erase gcloud gsutil bq
-  source "$HOME/google-cloud-sdk/path.fish.inc"
-  $argv
-end
-for cmd in gcloud gsutil bq
-  eval "function $cmd; google_cloud_sdk_lazy_init $cmd \$argv; end"
-end
 
 
 function fns --description "Interactively search/preview fish shell functions and aliases"

fish/functions/fish_prompt.fish

@@ -293,8 +293,6 @@ function fish_prompt
     set_color normal
 end
 
-
-
 if test -n "$SSH_TTY"
     function fish_right_prompt;
         set_color $fish_color_host