From 7cd672de52f32b97b8da18892d3de58cb1430c05 Mon Sep 17 00:00:00 2001 From: Xevion Date: Tue, 6 Jan 2026 12:00:42 -0600 Subject: [PATCH] refactor: move R2 credentials from env vars to chezmoi templates --- home/.chezmoitemplates/nushell/env.nu.tmpl | 6 ------ home/.chezmoitemplates/scripts/commonrc.fish.tmpl | 6 ------ home/.chezmoitemplates/scripts/commonrc.sh.tmpl | 6 ------ .../bin/{executable_share.ts => executable_share.ts.tmpl} | 8 ++++---- 4 files changed, 4 insertions(+), 22 deletions(-) rename home/dot_local/bin/{executable_share.ts => executable_share.ts.tmpl} (99%) diff --git a/home/.chezmoitemplates/nushell/env.nu.tmpl b/home/.chezmoitemplates/nushell/env.nu.tmpl index 3d07700..a0c96d9 100644 --- a/home/.chezmoitemplates/nushell/env.nu.tmpl +++ b/home/.chezmoitemplates/nushell/env.nu.tmpl @@ -70,12 +70,6 @@ $env.MICRO_TRUECOLOR = 1 # OpenAI API Key $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 $env.PATH = ($env.PATH | split row (char esep)) diff --git a/home/.chezmoitemplates/scripts/commonrc.fish.tmpl b/home/.chezmoitemplates/scripts/commonrc.fish.tmpl index d7d2af2..8c89a97 100644 --- a/home/.chezmoitemplates/scripts/commonrc.fish.tmpl +++ b/home/.chezmoitemplates/scripts/commonrc.fish.tmpl @@ -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 }}" -# 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) # This order matches the Bash config for consistency # Batched for performance - reduces startup time by ~13ms diff --git a/home/.chezmoitemplates/scripts/commonrc.sh.tmpl b/home/.chezmoitemplates/scripts/commonrc.sh.tmpl index 34dc336..861e98e 100644 --- a/home/.chezmoitemplates/scripts/commonrc.sh.tmpl +++ b/home/.chezmoitemplates/scripts/commonrc.sh.tmpl @@ -11,12 +11,6 @@ export TERM=xterm-256color # fixes terminal colors when ssh'ing into laptop 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 export HISHTORY_SERVER="https://hsh.{{ dopplerProjectJson.PRIVATE_DOMAIN }}" diff --git a/home/dot_local/bin/executable_share.ts b/home/dot_local/bin/executable_share.ts.tmpl similarity index 99% rename from home/dot_local/bin/executable_share.ts rename to home/dot_local/bin/executable_share.ts.tmpl index 15aba27..45ef216 100755 --- a/home/dot_local/bin/executable_share.ts +++ b/home/dot_local/bin/executable_share.ts.tmpl @@ -72,10 +72,10 @@ const REQUIRED_ENV = [ "R2_BUCKET", ]; const ENV = { - endpoint: process.env.R2_ENDPOINT || "", - accessKeyId: process.env.R2_ACCESS_KEY_ID || "", - secretAccessKey: process.env.R2_SECRET_ACCESS_KEY || "", - bucket: process.env.R2_BUCKET || "", + endpoint: "{{ dopplerProjectJson.R2_ENDPOINT }}", + accessKeyId: "{{ dopplerProjectJson.R2_ACCESS_KEY_ID }}", + secretAccessKey: "{{ dopplerProjectJson.R2_SECRET_ACCESS_KEY }}", + bucket: "{{ dopplerProjectJson.R2_BUCKET }}", }; const TIMING = {