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

Author: paulirish

.gitconfig

@@ -70,7 +70,7 @@
 	pager = delta
 
 [delta]
-	max-line-length = 700
+	max-line-length = 1400
 	# max-line-distance = 0.3 # better word-diff?
 	syntax-theme = base16
 	hyperlinks = true # i filed https://github.com/dandavison/delta/issues/362 but in 2022 i can't see brokenness in the issue nor repro weirdness. but i installed latest `less` anyway
@@ -141,7 +141,7 @@
 [merge]
 	tool = opendiff
 	renameLimit = 0
-	# still evaluating if i prefer this 3 item conflict dealio....
+	# This 3-item conflict style is MUCH better.
 	conflictstyle = zdiff3
 
 

fish/aliases.fish

@@ -23,7 +23,8 @@ alias ls='eza --classify=auto --color --group-directories-first --sort=extension
 alias la='eza --classify=auto --color --group-directories-first --sort=extension -a -l --octal-permissions --no-permissions'
 
 # use gdu (gdu-go) if available, as its faster on ssd
-alias ncdu "command -v gdu-go > /dev/null && gdu-go  || ncdu"
+# Ehh.. yes gdu is much faster but doesnt support ** in ignore/excludes.  use them deliberately for now
+# alias ncdu "command -v gdu-go > /dev/null && gdu-go  || ncdu"
 
 # typos and abbreviations
 abbr g git
@@ -147,7 +148,7 @@ 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.5-flash
+    llm chat -m gemini-2.5-flash
   else
     llm prompt -m gemini-2.5-flash "$argv" && echo "⬇️… and now rendered…⬇️" && llm logs -r | glow
   end
@@ -156,7 +157,7 @@ end
 function openai
   # using llm. same dealio as above
   if test -z "$argv[1]"
-    llm chat --continue -m gpt-4o
+    llm chat -m gpt-4o
   else
     llm prompt -m gpt-4o "$argv" && echo "⬇️… and now rendered…⬇️" && llm logs -r | glow
   end

fish/chromium.fish

@@ -57,8 +57,7 @@ end
 function dtb --description "build devtools with watch_build.js - my favorite"
     cd ./(git rev-parse --show-cdup)
 
-    # dont let vpython use a 2.7.. seems to only affect this dude
-    VPYTHON_BYPASS="manually managed python not supported by chrome operations" node scripts/watch_build.js
+    npm run build -- --watch
 end
 
 

fish/functions/fish_prompt.fish

@@ -221,7 +221,7 @@ function fish_prompt
 
     # instead of a onetime sourcing like
     #          test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
-    # here's a fancy lazy instantiated integration. but.. still slow and weird. 
+    # here's a fancy lazy instantiated integration. but.. still slow and weird.
     # iterms timestamps on scrollbar hover are probably good enough for now.
     # but here's the ugly thing i ended up with. prob delete later.
     # if not set -q __iterm2_integration_initialized
@@ -294,7 +294,7 @@ function fish_prompt
 end
 
 if test -n "$SSH_TTY"
-    function fish_right_prompt; 
+    function fish_right_prompt;
         set_color $fish_color_host
         echo -sn "(@" $hostname ")"
         set_color normal