[zsh] Updating aliases for new job

bash/.aliases

@@ -13,25 +13,22 @@ alias pull="git pull --rebase --autostash"
 alias push="git push"
 alias bookpull="rsync -aziuvhP root@rhea.local:/tank/books/ ~/.calibre/"
 alias bookpush="rsync -aziuvhP ~/.calibre/ root@rhea.local:/tank/books/"
-alias chglg="git add ./changelog/ && git commit -m 'Add changelog' && git push"
+
-alias slip="sli dev changelog"
 alias vdeploy="ssh life.unbl.ink \"rm -rf /root/vrobbler-venv/lib/python3.11/site-packages/vrobbler-0.15.4.dist-info/ && pip install git+https://code.unbl.ink/secstate/vrobbler.git@develop && systemctl restart vrobbler\""
 alias vsh="ssh life.unbl.ink vrobbler shell_plus"
+
 alias dump_gconf="dconf dump / > ~/.dotfiles/gnome/.local/share/custom-gconf.conf"
 alias e="emacsclient -nw $*"
-alias erase="docker compose run --rm django coverage erase"
+
-alias cov="docker compose run --rm django coverage report -m --fail-under=100 --omit='.venv/*,venv/*'"
-alias msh="docker compose run --rm django bash"
-alias lint="docker compose run --rm django runlinters"
-alias mmext="cd ~/src/github.com/multimediallc/mm-pay-external"
-alias test="erase && mmext && docker compose run --rm django pytest"
-alias mm="docker compose run --rm django $*"
-alias djc="docker compose run --rm django django-admin $*"
-alias djce="mmext && docker compose run --rm django django-admin $*"
-alias tok="docker compose run --rm --no-deps django ./manage.py gen_jwt data/dev-volume.key '{"sub": "00000000-0000-0000-0000-000000000001", "scope": "mm-pay-user"}'"
-alias pre="test && cov && lint"
-alias sdkfix="ruff format . && ruff check --fix ."
-alias mmlocalbuild="poetry run pip install --extra-index-url https://us-central1-python.pkg.dev/mmllc-dev/python/simple/ -r dev-requirements.txt"
 alias sweep_movies="sudo find /tank/videos/incoming -type f \( -iname '*.mp4' -o -iname '*.mkv' \) ! -iname '*sample*' -exec mv {} /tank/videos/movies/ \;"
 alias clear_incoming="sudo find /tank/videos/incoming -type d -maxdepth 1 -mindepth 1 ! -name '.stfolder' -exec rm -rf {} +"
 alias lk="load_keys"
+
+alias hrtest="~/src/github.com/hungryroot/hungryroot/manage.py test"
+alias h="cd ~/src/github.com/hungryroot/hungryroot"
+alias djrun="(cd ~/src/github.com/hungryroot/hungryroot && just django)"
+alias djsh="(cd ~/src/github.com/hungryroot/hungryroot && just djshell)"
+
+alias qa="(cd ~/src/github.com/hungryroot/hungryroot && just env-exec qa)"
+alias stage="(cd ~/src/github.com/hungryroot/hungryroot && just env-exec stage)"
+

zsh/.zshrc

@@ -14,15 +14,15 @@ source $ZSH/oh-my-zsh.sh
 # See ~/.aliases for the various aliases seen in here
 source "$HOME/.aliases"
 
-newemail () {
+newemail() {
-	curl -X POST --user colin@unbl.ink:$(pass personal/colin@unbl.ink | head -n 1) -d "address=$1@unbl.ink" -d "forwards_to=colin@unbl.ink" https://box.unbl.ink/admin/mail/aliases/add
+    curl -X POST --user colin@unbl.ink:$(pass personal/colin@unbl.ink | head -n 1) -d "address=$1@unbl.ink" -d "forwards_to=colin@unbl.ink" https://box.unbl.ink/admin/mail/aliases/add
 }
 
-yayup () {
+yayup() {
-  mv ~/.asdf ~/.asdf.bak
+    mv ~/.asdf ~/.asdf.bak
-  yay -S --noconfirm archlinux-keyring endeavouros-keyring
+    yay -S --noconfirm archlinux-keyring endeavouros-keyring
-  yay -Syu --noconfirm
+    yay -Syu --noconfirm
-  mv ~/.asdf.bak ~/.asdf
+    mv ~/.asdf.bak ~/.asdf
 }
 
 local hostname="%{$fg_bold[white]%}%m"
@@ -42,5 +42,14 @@ export TERM=xterm-256color
 
 export EDITOR=vim
 export VISUAL="$EDITOR"
-eval "$(/opt/homebrew/bin/brew shellenv)"
+
+case "$(uname -s)" in
+Linux)
+    eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+    ;;
+Darwin)
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+    ;;
+esac
+
 eval "$(direnv hook /bin/zsh)"