From c796dd737438dd02b96a37472612c48258fe89aa Mon Sep 17 00:00:00 2001
From: Amolith <amolith@secluded.site>
Date: Wed, 3 Dec 2025 12:15:32 -0700
Subject: [PATCH] feat(fish): switch to secrets helper

---
 dot_config/private_fish/config.fish.tmpl | 55 +++++++++++++-----------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/dot_config/private_fish/config.fish.tmpl b/dot_config/private_fish/config.fish.tmpl
index feaec554af7b29bf7234cbb1fd9d6b132087aba4..b15f61f3db48edb72be66b1448e3c9b7b0f8871b 100644
--- a/dot_config/private_fish/config.fish.tmpl
+++ b/dot_config/private_fish/config.fish.tmpl
@@ -65,32 +65,39 @@ set -x RANGER_LOAD_DEFAULT_RC false
 # Disable dumb Python keyring integration
 set -x PYTHON_KEYRING_BACKEND "keyring.backends.null.Keyring"
 
-set -x UV_PUBLISH_TOKEN "op://Private/PyPI/uv angmar"
-
-# Authenticate to local Radicle (.xyz) node
-{{ if eq .chezmoi.hostname "angmar" }}
-set -x RAD_PASSWORD "op://Private/2ujzijel6ni3np2uj5k5syptzm/angmar"
-{{ end }}
-{{ if eq .chezmoi.hostname "sidhe" }}
-set -x RAD_PASSWORD "op://Private/2ujzijel6ni3np2uj5k5syptzm/sidhe"
-{{ end }}
-
-# Auth to SourceHut
-set -x SRHT_TOKEN "op://Private/SourceHut/token"
-
-set -x GITHUB_AUTH_TOKEN "op://Private/github.com/pac"
+# Secrets (uses helper to respect opx-resolved values)
+function secret -a var val
+    set -q $var; or set -gx $var $val
+end
 
-set -x KAGI_API_KEY "op://Shared/Kagi/api_key"
+## PyPI
+secret UV_PUBLISH_TOKEN "op://Private/PyPI/uv angmar"
 
-# LLM Crap
-set -x OPENROUTER_API_KEY "op://Shared/OpenRouter/keys/shell"
-set -x OPENROUTER_KEY "$OPENROUTER_API_KEY"
-set -x PARALLEL_API_KEY "op://Private/Parallel.ai/api key"
-set -x PERPLEXITY_API_KEY "op://Private/nkhcb2h2ecfh26hksdgpw5txfu/api keys/CLI"
-set -x PERPLEXITY_LENSES "op://Private/nkhcb2h2ecfh26hksdgpw5txfu/lenses/text"
-set -x SYNTHETIC_API_KEY "op://Private/Synthetic/keys/main"
-set -x GEMINI_API_KEY "op://Private/Personal Google/gemini api"
-set -x CEREBRAS_API_KEY "op://Private/Cerebras/api keys/cli"
+## Radicle
+{{ if eq .chezmoi.hostname "angmar" -}}
+secret RAD_PASSWORD "op://Private/2ujzijel6ni3np2uj5k5syptzm/angmar"
+{{ end -}}
+{{ if eq .chezmoi.hostname "sidhe" -}}
+secret RAD_PASSWORD "op://Private/2ujzijel6ni3np2uj5k5syptzm/sidhe"
+{{ end }}
+## SourceHut
+secret SRHT_TOKEN "op://Private/SourceHut/token"
+
+## GitHub
+secret GITHUB_AUTH_TOKEN "op://Private/github.com/pac"
+
+## Kagi
+secret KAGI_API_KEY "op://Shared/Kagi/api_key"
+
+## LLMs
+secret OPENROUTER_API_KEY "op://Shared/OpenRouter/keys/shell"
+secret OPENROUTER_KEY "$OPENROUTER_API_KEY"
+secret PARALLEL_API_KEY "op://Private/Parallel.ai/api key"
+secret PERPLEXITY_API_KEY "op://Private/nkhcb2h2ecfh26hksdgpw5txfu/api keys/CLI"
+secret PERPLEXITY_LENSES "op://Private/nkhcb2h2ecfh26hksdgpw5txfu/lenses/text"
+secret SYNTHETIC_API_KEY "op://Private/Synthetic/keys/main"
+secret GEMINI_API_KEY "op://Private/Personal Google/gemini api"
+secret CEREBRAS_API_KEY "op://Private/Cerebras/api keys/cli"
 
 # PATHs
 fish_add_path "$XDG_DATA_HOME/npm-packages/bin"