too many updates to comment

5 files changed, 113 insertions, 93 deletions

diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 76f3095..73854e4 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -440,8 +440,8 @@ text/plain=colorize
 text/calendar=calendar
 message/delivery-status=colorize
 message/rfc822=colorize
-#text/html=pandoc -f html -t plain | colorize
-text/html=html | colorize
+text/html=pandoc -f html -t plain | colorize
+#text/html=html | colorize
 #text/*=cat -fP --file-name="$AERC_FILENAME"
 #application/x-sh=bat -fP -l sh
 #image/*=catimg -w $(tput cols) -
diff --git a/.local/bin/confgit.sh b/.local/bin/confgit.sh
index 813f97b..e7d2e82 100755
--- a/.local/bin/confgit.sh
+++ b/.local/bin/confgit.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env sh
 
+VER="$(git version |cut -d " " -f 3)"
+
 # Portably get number of procs
 OS="$(uname -s)"
 NPROCS=""
@@ -60,6 +62,14 @@ git config --global index.recordEndOfIndexEntries true
 git config --global index.recordOffsetTable true
 git config --global log.date iso
 git config --global merge.conflictstyle zdiff3
+if [ "${VER}" \> "2.45" ]; then
+        git config --global pack.allowPackReuse multi # Experimental
+        git config --global index.skipHash true # Experimental, will fail earlier than 2.40
+        git config --global index.version 4
+        git config --global fetch.negotiationAlgorithm skipping # Experimental
+        # Additional experimental configs
+        git config --global feature.manyFiles true
+fi
 git config --global pack.threads "$NPROCS" # Auto-detect threads from CPU
 git config --global pack.useBitmapBoundaryTraversal true
 git config --global pack.writeReverseIndex true
@@ -78,6 +88,11 @@ git config --global tag.sort taggerdate
 git config --global user.email tyler@gluecode.net
 git config --global user.name "Tyler Davis"
 
+if [ "${VER}" \> "2.47" ]; then
+        # Only enable reftable by default on git 2.47+ 
+        git config --global init.defaultRefFormat reftable
+fi
+
 # Eagerly detect errors
 git config --global transfer.fsckobjects true
 git config --global fetch.fsckobjects true
diff --git a/.local/bin/update_bsd.sh b/.local/bin/update_bsd.sh
index 6d879a8..7cbb608 100755
--- a/.local/bin/update_bsd.sh
+++ b/.local/bin/update_bsd.sh
@@ -21,8 +21,8 @@ cvs update -dP -r netbsd-10 ;
 cd /usr/src ;
 cvs update -dP -r netbsd-10 ;
 
-# Not sure if this will build X as well
-#/usr/src/build.sh -j $(sysctl -n hw.ncpu) -c clang -O /usr/obj/ -T /usr/tools/ -x -X /usr/xsrc -U -u distribution kernel=GENERIC ;
+# Build with Xsrc
+/usr/src/build.sh -j $(sysctl -n hw.ncpu) -c clang -O /usr/obj/ -T /usr/tools/ -x -X /usr/xsrc -U -u -P distribution kernel=GENERIC ;
 
-cd /usr/src ;
-/usr/src/build.sh -j $(sysctl -n hw.ncpu) -c clang -O /usr/obj/ -T /usr/tools/ -U -u distribution kernel=GENERIC ;
+# Build without X
+#/usr/src/build.sh -j $(sysctl -n hw.ncpu) -c clang -O /usr/obj/ -T /usr/tools/ -U -u -P distribution kernel=GENERIC ;
diff --git a/.local/share/git/repolist b/.local/share/git/repolist
index 415eeea..b9f2329 100644
--- a/.local/share/git/repolist
+++ b/.local/share/git/repolist
@@ -1,5 +1,6 @@
 cs631apue,origin=git@github.com:jschauma/cs631apue.git
 dark-mode-notify,origin=https://github.com/bouk/dark-mode-notify.git
+gotosocial,origin=https://github.com/superseriousbusiness/gotosocial.git
 hut,origin=https://git.sr.ht/~xenrox/hut
 journal,origin=git@git.sr.ht:~tydavis/journal
 resume,origin=git@git.sr.ht:~tydavis/resume
diff --git a/.profile b/.profile
index b1eccfe..d153344 100644
--- a/.profile
+++ b/.profile
@@ -3,110 +3,111 @@
 
 case $(uname) in
 Darwin)
-    if [ $SHELL = "/bin/bash" ] || [ $SHELL = "/opt/homebrew/bin/bash" ] || [ $SHELL = "/opt/local/bin/bash" ] ; then
-        set -o posix
-        # OSX-specific bash warning
-        export BASH_SILENCE_DEPRECATION_WARNING=1
-    fi
-
-    # MacPorts setup
-    if [ -d '/opt/local' ]; then
-        export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
-        export MANPATH=/opt/local/share/man:$MANPATH
-    fi
-
-    # Brew (OSX) specifics
-    if [ -f '/opt/homebrew/bin/brew' ]; then
-        export HOMEBREW_PREFIX="/opt/homebrew"
-        export HOMEBREW_CELLAR="/opt/homebrew/Cellar"
-        export HOMEBREW_REPOSITORY="/opt/homebrew"
-        export HOMEBREW_FORCE_BREWED_CURL=1 
-        export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:/opt/homebrew/opt/curl/bin${PATH+:$PATH}"
-        export MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:"
-        export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}"
-        if [ -f "/opt/homebrew/etc/bash_completion.d/git-completion.bash" ]; then
-            source /opt/homebrew/etc/bash_completion.d/git-completion.bash;
-        fi
-    fi
-
-    if [ $(command -v python3) ]; then
-        export PATH=$(python3 -m site --user-base)/bin:$PATH
-    fi
-
-    # Load config from filesystem
-    export AWS_SDK_LOAD_CONFIG=1
-
-    # Add Local bin
-    export PATH=$PATH:$HOME/.local/bin
-
-    # Unlock Keychain cli
-    alias unlock='security unlock-keychain ~/Library/Keychains/login.keychain'
-    alias ls='/bin/ls -F -h -A -D "%F %H:%M:%S"'
-    alias ll='/bin/ls -F -h -A -D "%F %H:%M:%S" -l'
-    alias dua='du -h -d 1 | sort -h'
+	if [ $SHELL = "/bin/bash" ] || [ $SHELL = "/opt/homebrew/bin/bash" ] || [ $SHELL = "/opt/local/bin/bash" ]; then
+		set -o posix
+		# OSX-specific bash warning
+		export BASH_SILENCE_DEPRECATION_WARNING=1
+	fi
+
+	# MacPorts setup
+	if [ -d '/opt/local' ]; then
+		export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
+		export MANPATH=/opt/local/share/man:$MANPATH
+	fi
+
+	# Brew (OSX) specifics
+	if [ -f '/opt/homebrew/bin/brew' ]; then
+		export HOMEBREW_PREFIX="/opt/homebrew"
+		export HOMEBREW_CELLAR="/opt/homebrew/Cellar"
+		export HOMEBREW_REPOSITORY="/opt/homebrew"
+		export HOMEBREW_FORCE_BREWED_CURL=1
+		export PATH="/opt/homebrew/bin:/opt/homebrew/sbin:/opt/homebrew/opt/curl/bin${PATH+:$PATH}"
+		export MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:"
+		export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}"
+		if [ -f "/opt/homebrew/etc/bash_completion.d/git-completion.bash" ]; then
+			source /opt/homebrew/etc/bash_completion.d/git-completion.bash
+		fi
+	fi
+
+	if [ $(command -v python3) ]; then
+		export PATH=$(python3 -m site --user-base)/bin:$PATH
+	fi
+
+	# Load config from filesystem
+	export AWS_SDK_LOAD_CONFIG=1
+
+	# Add Local bin
+	export PATH=$PATH:$HOME/.local/bin
+
+	# Unlock Keychain cli
+	alias unlock='security unlock-keychain ~/Library/Keychains/login.keychain'
+	alias ls='/bin/ls -F -h -A -D "%F %H:%M:%S"'
+	alias ll='/bin/ls -F -h -A -D "%F %H:%M:%S" -l'
+	alias dua='du -h -d 1 | sort -h'
 	;;
 Linux)
-    alias ls="/bin/ls --color=never -F -h -A "
-    alias ll="/bin/ls --color=never -F -h -A -l"
-    alias dua='du -h -d 1 | sort -h'
+	alias ls="/bin/ls --color=never -F -h -A "
+	alias ll="/bin/ls --color=never -F -h -A -l"
+	alias dua='du -h -d 1 | sort -h'
 	;;
 *BSD)
-    export PAGER=less
-    alias ls="/bin/ls -F -h -A "
-    alias ll="/bin/ls -F -h -A -l"
-    alias cvs-st="cvs -q -n update"
-    set -o emacs
-    if [ $SHELL = "/bin/sh" ]; then
-	set -o tabcomplete
-    fi
-    if [ -d "/usr/pkg/bin" ]; then
-	export PATH=$PATH:/usr/pkg/bin
-    fi
-    if [ -d "/usr/pkg/sbin" ]; then
-	export PATH=$PATH:/usr/pkg/sbin
-    fi
-    export PATH=$PATH:/sbin:/usr/sbin:$HOME/.local/bin
-
-    export CVS_RSH="ssh"
-    export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
-
-    #Newsraft env
-    export NO_COLOR="true"
+	export PAGER=less
+	alias ls="/bin/ls -F -h -A "
+	alias ll="/bin/ls -F -h -A -l"
+	alias cvs-st="cvs -q -n update"
+	set -o emacs
+	if [ $SHELL = "/bin/sh" ]; then
+		set -o tabcomplete
+	fi
+	if [ -d "/usr/pkg/bin" ]; then
+		export PATH=$PATH:/usr/pkg/bin
+	fi
+	if [ -d "/usr/pkg/sbin" ]; then
+		export PATH=$PATH:/usr/pkg/sbin
+	fi
+	export PATH=$PATH:/sbin:/usr/sbin:$HOME/.local/bin
+
+	export CVS_RSH="ssh"
+	export CVSROOT="anoncvs@anoncvs.NetBSD.org:/cvsroot"
+
+	#Newsraft env
+	export NO_COLOR="true"
 	;;
 esac
 
 # Go setup
 if [ -d "$HOME/.golang" ]; then
-    ### Just in case it's missing
-    mkdir -p ~/.golang/path
-    # Go in the homedir
-    if [ -d "$HOME/.golang/go" ]; then
-        export GOROOT_BOOTSTRAP=$HOME/.golang/bootstrap_go
-        export GOROOT=$HOME/.golang/go
-    fi
-    export GOPATH=$HOME/.golang/path
-    # Disable broken caching by proxy.golang
-    export GOPROXY=direct
-    export GOSUMDB=off
-    export PATH=$HOME/.golang/go/bin:$PATH:$HOME/.golang/path/bin
+	### Just in case it's missing
+	mkdir -p ~/.golang/path
+	# Go in the homedir
+	if [ -d "$HOME/.golang/go" ]; then
+		#export GOROOT_BOOTSTRAP=$HOME/.golang/bootstrap_go
+		export GOROOT_BOOTSTRAP=/usr/pkg/go122/
+		export GOROOT=$HOME/.golang/go
+	fi
+	export GOPATH=$HOME/.golang/path
+	# Disable broken caching by proxy.golang
+	export GOPROXY=direct
+	export GOSUMDB=off
+	export PATH=$HOME/.golang/go/bin:$PATH:$HOME/.golang/path/bin
 fi
 
 # == Editors ==
 # Vim not detected? Use vi as a fallback
 if [ ! "$(command -v vim)" ]; then
-    alias vim=vi
-    export EDITOR="vi"
+	alias vim=vi
+	export EDITOR="vi"
 fi
 
 if [ "$(command -v code)" ] && [ "$(env | grep VSCODE)" ]; then
-    export EDITOR="code"
-    export VISUAL="code"
+	export EDITOR="code"
+	export VISUAL="code"
 #elif [ "$(command -v hx)" ]; then
 #    export EDITOR="hx"
 #    export VISUAL="hx"
 else
-    export EDITOR="vim"
-    export VISUAL="vim"
+	export EDITOR="vim"
+	export VISUAL="vim"
 fi
 
 # Ensure less always uses the one-page, raw control characters, and no-init settings
@@ -118,13 +119,17 @@ alias gc_all="find $HOME/.code -name \".git\" | xargs -I {} -n 1 bash -c \"cd {}
 
 ## Zstd always uses all cores
 if [ "$(command -v zstd)" ]; then
-    alias zstd='zstd -T0'
+	alias zstd='zstd -T0'
 fi
 
 # == Rust Tools ==#
 # Add Rust paths if present
 if [ -d "$HOME/.cargo/bin" ]; then
-    export PATH=$HOME/.cargo/bin:$PATH
+	export PATH=$HOME/.cargo/bin:$PATH
+fi
+
+if [ $(command -v yt-dlp) ]; then
+	alias yt-dlp="yt-dlp -S ext:mp4:m4a "
 fi
 
 # == END TOOLS ==
@@ -140,9 +145,8 @@ alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
 ## == END DOTFILES ==
 
 # Dedupe path entries
-export PATH=`printf %s "$PATH" | awk -v RS=: '{ if (!arr[$0]++) {printf("%s%s",!ln++?"":":",$0)}}'`
+export PATH=$(printf %s "$PATH" | awk -v RS=: '{ if (!arr[$0]++) {printf("%s%s",!ln++?"":":",$0)}}')
 
 export HISTFILE=~/.history
 export HISTSIZE=10000
 export PS1='\$ '
-