Update .bash_aliases

Author: Skenvy

.bash_aliases

@@ -15,42 +15,75 @@ alias rehome_undo="git restore --staged dotfiles && git restore dotfiles && git
 # described by the README. For any additional aliases I use, I've added them
 # only in https://github.com/Skenvy/dotfiles/blob/home/.bash_aliases my home.
 
+# For using this repo as $HOME on Windows+WSL
+alias wsl_resym_ssh="( shopt -s dotglob; WINDOWS_PATH=\"/mnt/c/Users/\$LOCAL_WINDOWS_USERNAME/\"; for f in \$WINDOWS_PATH.ssh/*; do  grep -qx \"\$(tracking)\" <<< \"\${f/\$WINDOWS_PATH/}\" && echo \"TRACKED FILE NOT SYM'd \$f\" || (echo \"UNTRACKED WILL BE LINKED \$f\" && ln -sf \"\$f\" ~/\${f/\$WINDOWS_PATH/}); done )"
+
+################################################################################
+# Main things
+
+# The only right way to ls
 alias gg="ls -liath"
+# Pretty print the PATH
 alias yellow_brick_road="echo \$PATH | tr ':' '\n'"
+# Git shell if you hate yourself lol
 alias gsh="perl -nE 'BEGIN {print \"git (CTRL+D to quit)> \"} system \"git \$_\"; print \"git (CTRL+D to quit)> \"'"
-# alias start_iterm_from_here="pwd > ~/.iterm2/initdir"
 
-# For using this repo as $HOME on Windows+WSL
-alias wsl_resym_ssh="( shopt -s dotglob; WINDOWS_PATH=\"/mnt/c/Users/\$LOCAL_WINDOWS_USERNAME/\"; for f in \$WINDOWS_PATH.ssh/*; do  grep -qx \"\$(tracking)\" <<< \"\${f/\$WINDOWS_PATH/}\" && echo \"TRACKED FILE NOT SYM'd \$f\" || (echo \"UNTRACKED WILL BE LINKED \$f\" && ln -sf \"\$f\" ~/\${f/\$WINDOWS_PATH/}); done )"
+################################################################################
+# Git (simple)
 
-# Git
+# Print the log as "Tree Hash | Commit Hash | Parent Hash(es)"
 alias yikes="git log --pretty=format:\"%T | %H | %P\""
-alias quack="git diff \$(git merge-base \$(git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f 2) HEAD).. --stat"
-alias honk="git diff \$(git merge-base \$(git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f 2) HEAD).."
+# Print the full config diagnostic
+alias gvconf="git config --list --show-origin --show-scope"
+# What files are being tracked here?
+alias tracking="git ls-tree --full-tree --name-only -r HEAD"
+# Remove a hook if you've been snagged by one.
+alias unhook="git config --unset core.hookspath"
+
+# If a branch name is hella long and you cbf manually copy pasting use these to swap context
+# idk I was really hungry when I wrote them and about to go buy a McAngus for lunch, don't @ me.
+alias cook_mcangus="CURR_BRANCH=\$(git branch -a | grep \* | cut -d ' ' -f2) && echo \"\\\$CURR_BRANCH = \$CURR_BRANCH\""
+alias eat_mcangus="git checkout \$CURR_BRANCH"
+
+################################################################################
+# Git (rev-parse --abbrev-ref origin/HEAD) edition
+
 # If "git rev-parse --abbrev-ref origin/HEAD" in the following fails,
 # use "git ls-remote --symref origin HEAD" to verify the remote HEAD,
 # and if it's ok, re-run "git remote set-head origin --auto" to fix.
+
+# to get a smol (--stat) diff to the trunk, or a full diff.
+alias quack="git diff \$(git merge-base \$(git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f 2) HEAD).. --stat"
+alias honk="git diff \$(git merge-base \$(git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f 2) HEAD).."
+
+# use this when you aren't currently on the trunk to update it without swapping off your current branch
 alias pull_trunk="__=\$(git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f 2) && git fetch origin \$__:\$__"
+# use this when you want to "be on and ..." update only the trunk branch
+alias checkout_trunk_head="__=\$(git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f 2) && git checkout \$__ && git fetch --update-head-ok origin \$__:\$__ && git reset --hard HEAD"
+
 alias merge_trunk="__=\$(git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f 2) && git fetch origin \$__:\$__ && git merge \$__"
 alias merge_trunk_squash_theirs="__=\$(git rev-parse --abbrev-ref origin/HEAD | cut -d/ -f 2) && git fetch origin \$__:\$__ && git merge --squash -X theirs \$__"
-alias cook_mcangus="CURR_BRANCH=\$(git branch -a | grep \* | cut -d ' ' -f2) && echo \"\\\$CURR_BRANCH = \$CURR_BRANCH\""
-alias eat_mcangus="git checkout \$CURR_BRANCH"
-alias unhook="git config --unset core.hookspath"
-alias gvconf="git config --list --show-origin --show-scope"
-alias tracking="git ls-tree --full-tree --name-only -r HEAD"
 
+################################################################################
 # Docker
+
 alias yeet="docker run --rm -it ubuntu"
 alias bezos="docker run -it --rm amazonlinux bash"
 alias MLG="docker run -it --rm fedora bash"
+
+alias snek13="docker run -it --rm python:3.13-slim bash"
+alias snek12="docker run -it --rm python:3.12-slim bash"
 alias snek11="docker run -it --rm python:3.11-slim bash"
-alias snek10="docker run -it --rm python:3.10.15-slim bash"
+alias snek10="docker run -it --rm python:3.10-slim bash"
 alias snek9="docker run -it --rm python:3.9-slim bash"
 alias snek8="docker run -it --rm python:3.8-slim bash"
 
+################################################################################
 # Other
 alias venv="deactivate 2> /dev/null; python3 -m venv .ve; env; pip3 install --upgrade pip; pip install --upgrade pylama==7.7.1 pylint wheel"
 alias env="deactivate 2> /dev/null; source .ve/bin/activate 2> /dev/null"
+# If you're on a Mac using iterm2 with settings that cd to restart it from a location read from a file...
+alias start_iterm_from_here="pwd > ~/.iterm2/initdir"
 alias tfff="terraform fmt -check -diff -recursive"
 alias hello="cowsay -f dragon Hello"