a few updates

Author: paulirish

.exports

@@ -31,7 +31,7 @@ export LESSSECURE=1
 # note.. `fd` seems faster than `ag`.. but if i wanted to use `ag` this is good: command ag --files-with-matches --filename-pattern ""
 # fd > 8.1 got slower. https://github.com/sharkdp/fd/issues/1131
 #    so.. here's the install for the last fast one: CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install --vers 8.1.1 fd-find
-# To do a fzf including hidden/ignord files.. 'fd --unrestricted'
+# To do a fzf including hidden/ignord files.. 'fd --unrestricted' or shorter: 'fd -u'
 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 {}'"

.gitconfig

@@ -67,8 +67,8 @@
 	excludesfile = ~/.gitignore
 	attributesfile = ~/.gitattributes
 	precomposeUnicode = true
-	# https://github.com/dandavison/delta
-	pager = delta
+	# https://github.com/dandavison/delta.  full path for agents running in subshells.
+	pager = /opt/homebrew/bin/delta
 
 [delta]
 	max-line-length = 1400

.ssh.config.example

@@ -1,22 +1,16 @@
 # copy to ~/.ssh/config
 
-Host github.com
-	ControlMaster auto
-	ControlPersist 120
-
 Host *
-	# Always use SSH2.
-	Protocol 2
-
-	# Use a shared channel for all sessions to the same host,
-	# instead of always opening a new one. This leads to much
-	# quicker connection times.
-	ControlMaster auto
-	ControlPath ~/.ssh/control/%r@%h:%p
-	ControlPersist 1800
+    # Use a shared channel for all sessions to the same host,
+    # instead of always opening a new one. This leads to much
+    # quicker connection times.
+    ControlMaster auto
+    ControlPath ~/.ssh/control/%C
+    ControlPersist 1800
 
-	# also this stuff
-	Compression yes
-	TCPKeepAlive yes
-	ServerAliveInterval 20
-	ServerAliveCountMax 10
+    # Personal preference but with 'no', the OS won't kill the socket during a temporary outage
+    TCPKeepAlive no 
+    # Also this stuff
+    Compression yes
+    ServerAliveInterval 30
+    ServerAliveCountMax 6

brew.sh

@@ -20,7 +20,7 @@ PACKAGES=(
   the_silver_searcher ripgrep fzf fd bat eza glow jq jdupes datamash pandoc pdfgrep cloc
 
   # Dev Runtimes & Build Tools
-  deno pnpm rbenv bazel gradle cmake ninja mkcert
+  node deno pnpm rbenv bazel gradle cmake ninja mkcert
 
   # Watchers & Linters
   watchexec entr shellcheck

docs/bash tricks.md

@@ -2,20 +2,21 @@ bash tricks
 
 # dont allow commiting to main branch
 
+run this:
+
 ```sh
+cat << 'EOF' > .git/hooks/pre-commit && chmod +x .git/hooks/pre-commit
 #!/bin/sh
 
 branch="$(git rev-parse --abbrev-ref HEAD)"
 
 if [ "$branch" = "main" ]; then
-  echo "Hello from .git/hooks/pre-commit"
-  echo "You can't commit directly to main branch."
+  echo "You can't commit directly to main. Make a feature branch.  [Sincerely, your .git/hooks/pre-commit]"
   exit 1
 fi
+EOF
 ```
 
-save that to `.git/hooks/pre-commit`
-
 
 # use one of two binaries:
 Create alias if it doesn't already exist:

fish/aliases.fish

@@ -123,15 +123,14 @@ alias mine="git checkout mine"
 
 
 
-# ag defaults. go as wide as terminal (minus some space for line numbers)
-# i used to like `--follow --hidden` but dont anymore. -follow ends up with lots of fstat errors on broken symlinks. and --hidden is something that should be turned on explicitly.
-# OKAY RIPGREP is way faster than AG. i gotta drop ag like its hot.
-#        also ripgrep doesnt buffer output so you can pipe it somewhere and it'll go as it happens.  wow yah SO much better.
-# alias ag='command ag -W (math $COLUMNS - 14)'
+# Ripgrep > ag (silver_seacher).  By far. definitely faster and also doesnt buffer output so you can pipe it somewhere and it'll go as it happens
+# -uu is the combo of `--no-ignore` and `--hidden` which is what i often want to look through gitignored stuff and other hidden things.
+abbr rgu 'rg -uu'
 
 # fd is fast but their multicore stuff is dumb and slow and bad. https://github.com/sharkdp/fd/issues/1203
 # alias fd='command fd -j1 --exclude node_modules'
 abbr fdfind 'fd'
+# fd's -u  is equivalent to rg's -uu.
 abbr fzfall 'fd --unrestricted | fzf'
 
 # By default watchexec thinks the project origin is higher up.  So dumb.

fish/config.fish

@@ -111,5 +111,6 @@ and . (code --locate-shell-integration-path fish)
 
 
 # begin gd completion
-gd --completion-fish | source
+# gd --completion-fish | source
 # end gd completion
+

fish/functions.fish

@@ -27,6 +27,18 @@ function solve_all_conflicts --description 'try to solve all current git conflic
   echo "Conflicted files: $before ==> $after"
 end
 
+
+# git-recent with experimental worktree support
+function recent
+  set -l o (~/code/git-recent/git-recent $argv)
+  if test -d "$o"
+    cd $o
+  else if test -n "$o"
+    echo $o
+  end
+end
+
+
 function killprocess --description 'Kill process that user selects in fzf (from ps aux output)'
   set -l pid (ps aux | fzf -m --header-lines=1 | awk '{print $2}')
 

setup-a-new-machine.sh

@@ -5,6 +5,10 @@
   read -n 1
 
 
+# ssh multiplexing control sockets
+mkdir ~/.ssh/control
+
+
 ##############################################################################################################
 ###  backup old machine's key items
 
@@ -147,9 +151,6 @@ export PATH=$HOME/homebrew/bin:$HOME/homebrew/sbin:$PATH
 ### install of common things
 ###
 
-# github.com/jamiew/git-friendly
-# the `push` command which copies the github compare URL to my clipboard is heaven
-bash < <( curl https://raw.github.com/jamiew/git-friendly/master/install.sh)
 
 # autocompletion for git branch names https://git-scm.com/book/en/v1/Git-Basics-Tips-and-Tricks
 curl https://raw.githubusercontent.com/git/git/master/contrib/completion/git-completion.bash -o ~/.git-completion.bash
@@ -164,9 +165,6 @@ npm install -g git-recent
 # trash as the safe `rm` alternative
 npm install --global trash-cli
 
-# more readable git diffs
-npm install --global diff-so-fancy
-
 # my preferred statik webserver
 npm install -g statikk