diff --git a/dot_config/private_fish/config.fish.tmpl b/dot_config/private_fish/config.fish.tmpl
index 04dcf429927f46a68daa1b9025aae378238bf6aa..feaec554af7b29bf7234cbb1fd9d6b132087aba4 100644
--- a/dot_config/private_fish/config.fish.tmpl
+++ b/dot_config/private_fish/config.fish.tmpl
@@ -125,6 +125,17 @@ if status is-interactive
 	alias zed="zeditor"
 	{{ end }}
 
+    # Wrap some tools in an executor that searches the env for secrets and
+    # ephemerally resolves them to their values
+    alias llm="opx llm"
+    alias llm="opx llm"
+    alias crush="opx crush"
+    alias claude="opx claude"
+    alias octo="opx octo"
+    alias synu="opx synu"
+    alias synclaude="opx synclaude"
+    alias opencode="opx opencode"
+
     # Bunch of aliases
 	alias wget="wget --hsts-file=\"$XDG_DATA_HOME/wget-hsts\""
 	alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"