From ed5216ff0e4fa08e3bc23df1762666cd63a84900 Mon Sep 17 00:00:00 2001
From: Xevion <xevion@xevion.dev>
Date: Mon, 3 Mar 2025 02:29:16 -0600
Subject: [PATCH] Switch to doppler key vault for remaining rbw usages

---
 home/.chezmoitemplates/scripts/commonrc.sh.tmpl | 8 +++++---
 home/run_onchange_install-packages.sh.tmpl      | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/home/.chezmoitemplates/scripts/commonrc.sh.tmpl b/home/.chezmoitemplates/scripts/commonrc.sh.tmpl
index 40c2467..cb3d903 100644
--- a/home/.chezmoitemplates/scripts/commonrc.sh.tmpl
+++ b/home/.chezmoitemplates/scripts/commonrc.sh.tmpl
@@ -7,7 +7,8 @@ export MICRO_TRUECOLOR=1
 export TERM=xterm-256color  # fixes terminal colors when ssh'ing into laptop
 
 # authentication
-export OPENAI_API_KEY="{{ (rbw "OpenAI - chatgpt-cli Key").data.password }}"
+
+export OPENAI_API_KEY="{{ dopplerProjectJson.OPENAI_CHATGPT_CLI }}"
 
 # hishtory
 export HISHTORY_SERVER="https://hsh.{{ .data.privateDomain }}"
@@ -63,8 +64,9 @@ if [ -d $HOME/.jenv/bin ]; then
 fi
 
 if command -v hass-cli &> /dev/null; then
-  export HASS_SERVER={{ (index (rbw "HAS-CLI-CODE Token").data.uris 0).uri }}
-  export HASS_TOKEN={{ (rbw "HAS-CLI-CODE Token").data.password }}
+  export HASS_SERVER={{ dopplerProjectJson.HASS_SERVER_URL }}
+  export HASS_TOKEN={{ dopplerProjectJson.HASS_SERVER_TOKEN }}
+  
   {{ if eq .shell "bash" -}}
   source <(_HASS_CLI_COMPLETE=bash_source hass-cli)
   {{ else if eq .shell "zsh" -}}
diff --git a/home/run_onchange_install-packages.sh.tmpl b/home/run_onchange_install-packages.sh.tmpl
index 01e8374..7e3409f 100644
--- a/home/run_onchange_install-packages.sh.tmpl
+++ b/home/run_onchange_install-packages.sh.tmpl
@@ -55,10 +55,12 @@ fi
 
 # Hishtory initialization
 if type -P hishtory; then
-    if ! hishtory status | grep -q "$(rbw get 'hishtory-user_secret')"; then
+
+
+    if ! hishtory status | grep -q "$(doppler secrets get HISHTORY_USER_SECRET --plain)"; then
         echo "chezmoi: expected user secret not found, initializing hishtory"
 
-        hishtory init "$(rbw get 'hishtory-user_secret')" --force
+        hishtory init "$(doppler secrets get HISHTORY_USER_SECRET --plain)" --force
         hishtory syncing enable
     fi
 else