diff --git a/bash/.aliases b/bash/.aliases
index a66b2ae..60cdccc 100644
--- a/bash/.aliases
+++ b/bash/.aliases
@@ -25,4 +25,4 @@ alias lint="docker compose run --rm django runlinters"
 alias test="docker compose run --rm django pytest"
 alias mm="docker compose run --rm django $*"
 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="pytest && cov && lint"
+alias pre="test && cov && lint"
diff --git a/emacs/.config/doom/config.el b/emacs/.config/doom/config.el
index 10a7887..38a40a9 100644
--- a/emacs/.config/doom/config.el
+++ b/emacs/.config/doom/config.el
@@ -5,7 +5,7 @@
 
 (nyan-mode)
 
-(setq doom-theme 'doom-one
+(setq doom-theme 'doom-xcode
       doom-font (font-spec :family "Iosevka" :size 14 :weight 'regular)
       doom-big-font (font-spec :family "Iosevka" :size 18 :weight 'regular)
       doom-variable-pitch-font (font-spec :family "Overpass" :size 12))
diff --git a/emacs/.config/doom/init.el b/emacs/.config/doom/init.el
index e6b2dff..6edefb2 100644
--- a/emacs/.config/doom/init.el
+++ b/emacs/.config/doom/init.el
@@ -34,7 +34,7 @@
        ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
        (emoji +unicode)  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
-       ;;hydra
+       hydra
        ;;indent-guides     ; highlighted indent columns
        ligatures         ; ligatures and symbols to make your code pretty again
        ;;minimap           ; show a map of the code on the side
diff --git a/git/.gitconfig b/git/.gitconfig
index 7881484..17b16d1 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -55,3 +55,5 @@
 	smtpuser = colin@unbl.ink
 	smtpencryption = tls
 	smtpserverport = 587
+[credential]
+	helper = osxkeychain
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
index 3e095a0..b05126e 100644
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -3,7 +3,7 @@
 include ./kitty-themes/themes/Monokai.conf
 
 font_family IBM Plex Mono
-font_size 10.0
+font_size 12.0
 enable_audio_bell no
 visual_bell_duration 0.1
 window_padding_width 12
diff --git a/ssh/.ssh/authorized_keys b/ssh/.ssh/authorized_keys
index c53a70d..2529c37 100644
--- a/ssh/.ssh/authorized_keys
+++ b/ssh/.ssh/authorized_keys
@@ -1,7 +1,3 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2vNVzBll3GeXH8DdM72AF1Q/ekZhR8xP04z/huAmoC2NVZBQ9qG6wpHZ8+yC/Rl1eSECN27RHlASs9MdGwgETKAKe8VoKFNFjQPe7tvz0xJLJ+CBA84YnEjzXiRp9Ot6sBBaX/xtyNNGnwckla5Vu8/MlPNIhgCtTCG4QnTIWNCYICQZCr96Kwd9r1vjC0qZjA1WpaKKlhpKiLKGW0ln7rqh10Txbt512yJR78j7/q5tYiecMDwqV4JeY8KmzqSywDJqO7vGJnkisn6RrlRgw4WBOqFGv42oZ/XqEd9UqKxuTu/7/7N5fKTwE4hhX+bIPxg+w0tnhdGUxMLwluROw== powellc
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAuYeEACWGt+wrKzZnPaDf4OAXWlWcMA8chC4yyh3czR powellc@iapetus
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7mO6H91Ax6AfxOeX0RpzIPN/xvxrhXZY5k+A5Y9dr3Xl4Y0fHsa83oul64XnmAxm0rm552QwpqFSqSiyKYzuv1ZEwq3MJWth4TFXI8owMqvSROz5ZrHWDQzRC0mVcWVRTsvhnb5Mz2aixarisCd7FgVbzBOuVaJBCqzZrHj/+06zRlMloljrX7I2vJIP2xL7aISjaThlbIzOqi34iP+HjnAATmeilyVXLQuh2XONQt4WoSaZcQjPnYT5li/9bezCZv2YM6o5KIFgclO6LRxDr6D5+Yw9/BoMedob+/VeGLkABAqFrOZQA6mSOxJvlti/OiBZA8b4zUSzYESK/sjcH root@box.onec.me
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/zDMnzrppS4b6GSD4z3ZnWiKOSRPMYe6vbduKeObuuEP9hXdm5IEn0lWvlk2HDlYwT+HADHnxIlu0ZsFyWEGaNvVPM1D4x5hSSdTnqm5LRoOt+y1EntU9oDFgvio++XxETaq3SNw/S9twX3X+CbFkjbAXN0bJqKy/ziLE8m2Qk2wiCRfEWxV1c9A0ba48FeGABxaVRrGAveNq9lqqJsWUGY6pQ01STSO/uHcLJmkEhXZQuRt4qAS/SjCDNhLkmpAWrtxuiOUt8GtgrzMl8stXJs49FsO/iIzgc8yneDQ7Z3NUJymx86/tb0UPoCeHljkFFzyXSEjMgM9owoUp73uf powellc@prometheus
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFbkMSZmqyHZ0uh8uAxRJZf+8sKYkNpXz8o8YMw6grjz Colin's private key for 2022-H2
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMr7Wwdda04owkvo9cemdTxuqAwyfRt2NORUPgm9+JAE colin@unbl.ink
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIECO9SFmpc2zkPXFZjQ6L0H3R1EW/PD7ITzk59VnP8xU colin.powell@sureapp.com
+# Keys added to this file will be automatically
+# copied to your authorized_keys file by the JumpCloud agent.
+# Constructed by the JumpCloud agent, you can add keys manually in /Users/cpowell/.ssh/authorized_keys.jcorig
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 8a3e511..b12f6ee 100644
--- a/ssh/.ssh/config
+++ b/ssh/.ssh/config
@@ -13,7 +13,7 @@ Host github.com
     ServerAliveInterval 300
     ServerAliveCountMax 2
     AddKeysToAgent yes
-    IdentityFile ~/.ssh/2022_git
+    IdentityFile ~/.ssh/2025_git
 
 # Home Gitea account:
 Host code.unbl.ink git.service 192.168.40.83 gogs*
@@ -79,7 +79,7 @@ Host penobscotbaypress.com atlas.local
 #####
 
 Host bastion.unbl.ink
-    Port 33
+    Port 333
     User powellc
     IdentityFile ~/.ssh/2022_h2_powellc
 
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 8536480..74293a0 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,7 +1,7 @@
 # If you come from bash you might have to change your $PATH.
 export GOPATH="$HOME/.go"
-export PATH=$HOME/.bin:$HOME/var/bin:/usr/local/bin:$PATH:$HOME/.go/bin
-. "$HOME/.atuin/bin/env"
+export PATH=$HOME/.bin:$HOME/var/bin:/usr/local/bin:$PATH:$HOME/.go/bin:$HOME/.local/bin
+#. "$HOME/.atuin/bin/env"
 
 export ZSH="$HOME/.oh-my-zsh"
 
@@ -25,7 +25,7 @@ yayup () {
   mv ~/.asdf.bak ~/.asdf
 }
 
-eval "$(/home/powellc/.atuin/bin/atuin init zsh)"
+eval "$(/opt/homebrew/bin/atuin init zsh)"
 
 local hostname="%{$fg_bold[white]%}%m"
 
@@ -39,6 +39,5 @@ export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
 ## [/Completion]
 
 export PATH="/home/powellc/.shorebird/bin:$PATH"
-export PATH="/home/powellc/.asdf/bin:$PATH"
-export ASDF_DATA_DIR="/home/powellc/.asdf"
-export PATH="$ASDF_DATA_DIR/shims:$PATH"
+export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH"
+. ${ASDF_DATA_DIR:-$HOME/.asdf}/plugins/golang/set-env.zsh