refactor: move R2 credentials from env vars to chezmoi templates

This commit is contained in:
2026-01-06 12:00:42 -06:00
parent 9e30c9b027
commit 7cd672de52
4 changed files with 4 additions and 22 deletions
@@ -70,12 +70,6 @@ $env.MICRO_TRUECOLOR = 1
# OpenAI API Key # OpenAI API Key
$env.OPENAI_API_KEY = "{{ dopplerProjectJson.OPENAI_CHATGPT_CLI }}" $env.OPENAI_API_KEY = "{{ dopplerProjectJson.OPENAI_CHATGPT_CLI }}"
# R2 configuration
$env.R2_ENDPOINT = "{{ dopplerProjectJson.R2_ENDPOINT }}"
$env.R2_ACCESS_KEY_ID = "{{ dopplerProjectJson.R2_ACCESS_KEY_ID }}"
$env.R2_SECRET_ACCESS_KEY = "{{ dopplerProjectJson.R2_SECRET_ACCESS_KEY }}"
$env.R2_BUCKET = "{{ dopplerProjectJson.R2_BUCKET }}"
# Initialize PATH as a list for easier manipulation # Initialize PATH as a list for easier manipulation
$env.PATH = ($env.PATH | split row (char esep)) $env.PATH = ($env.PATH | split row (char esep))
@@ -11,12 +11,6 @@ set -gx TERM xterm-256color # fixes terminal colors when ssh'ing into laptop
set -gx OPENAI_API_KEY "{{ dopplerProjectJson.OPENAI_CHATGPT_CLI }}" set -gx OPENAI_API_KEY "{{ dopplerProjectJson.OPENAI_CHATGPT_CLI }}"
# R2 configuration
set -gx R2_ENDPOINT "{{ dopplerProjectJson.R2_ENDPOINT }}"
set -gx R2_ACCESS_KEY_ID "{{ dopplerProjectJson.R2_ACCESS_KEY_ID }}"
set -gx R2_SECRET_ACCESS_KEY "{{ dopplerProjectJson.R2_SECRET_ACCESS_KEY }}"
set -gx R2_BUCKET "{{ dopplerProjectJson.R2_BUCKET }}"
# Tools are organized in priority order (first = highest priority in PATH) # Tools are organized in priority order (first = highest priority in PATH)
# This order matches the Bash config for consistency # This order matches the Bash config for consistency
# Batched for performance - reduces startup time by ~13ms # Batched for performance - reduces startup time by ~13ms
@@ -11,12 +11,6 @@ export TERM=xterm-256color # fixes terminal colors when ssh'ing into laptop
export OPENAI_API_KEY="{{ dopplerProjectJson.OPENAI_CHATGPT_CLI }}" export OPENAI_API_KEY="{{ dopplerProjectJson.OPENAI_CHATGPT_CLI }}"
# R2 configuration
export R2_ENDPOINT="{{ dopplerProjectJson.R2_ENDPOINT }}"
export R2_ACCESS_KEY_ID="{{ dopplerProjectJson.R2_ACCESS_KEY_ID }}"
export R2_SECRET_ACCESS_KEY="{{ dopplerProjectJson.R2_SECRET_ACCESS_KEY }}"
export R2_BUCKET="{{ dopplerProjectJson.R2_BUCKET }}"
# hishtory configuration # hishtory configuration
export HISHTORY_SERVER="https://hsh.{{ dopplerProjectJson.PRIVATE_DOMAIN }}" export HISHTORY_SERVER="https://hsh.{{ dopplerProjectJson.PRIVATE_DOMAIN }}"
@@ -72,10 +72,10 @@ const REQUIRED_ENV = [
"R2_BUCKET", "R2_BUCKET",
]; ];
const ENV = { const ENV = {
endpoint: process.env.R2_ENDPOINT || "", endpoint: "{{ dopplerProjectJson.R2_ENDPOINT }}",
accessKeyId: process.env.R2_ACCESS_KEY_ID || "", accessKeyId: "{{ dopplerProjectJson.R2_ACCESS_KEY_ID }}",
secretAccessKey: process.env.R2_SECRET_ACCESS_KEY || "", secretAccessKey: "{{ dopplerProjectJson.R2_SECRET_ACCESS_KEY }}",
bucket: process.env.R2_BUCKET || "", bucket: "{{ dopplerProjectJson.R2_BUCKET }}",
}; };
const TIMING = { const TIMING = {