From 81632fd21cb85ff4227b3ee6c58e417bdbd38e27 Mon Sep 17 00:00:00 2001
From: William Hearn <sylus1984@gmail.com>
Date: Thu, 22 Feb 2024 18:30:49 -0500
Subject: [PATCH] test

---
 .github/workflows/github.yaml                                 | 4 +++-
 .../run_onchange_before_10_install-darwin-packages.tmpl       | 1 +
 .../run_onchange_before_10_install-debian-packages.tmpl       | 2 +-
 home/.chezmoitemplates/debian/brewfile                        | 1 +
 home/dot_zshenv                                               | 3 ++-
 home/private_dot_config/zsh/dot_zshrc.tmpl                    | 2 +-
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/github.yaml b/.github/workflows/github.yaml
index 81d80da..4864ff9 100644
--- a/.github/workflows/github.yaml
+++ b/.github/workflows/github.yaml
@@ -77,4 +77,6 @@ jobs:
               run: ./install.sh
 
             - name: Run tests
-              run: ~/.local/bin/check-dotfiles
+              run: |
+                source ~/.zshenv
+                ~/.local/bin/check-dotfiles
diff --git a/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-packages.tmpl b/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-packages.tmpl
index a56e1bd..1e38322 100644
--- a/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-packages.tmpl
+++ b/home/.chezmoiscripts/darwin/run_onchange_before_10_install-darwin-packages.tmpl
@@ -17,6 +17,7 @@ brew update
 
 # Temporary Overrides
 brew install --overwrite python@3.11
+brew install --overwrite python@3.12
 brew install --overwrite go
 
 brew bundle --verbose --no-lock --file=/dev/stdin <<EOF
diff --git a/home/.chezmoiscripts/debian/run_onchange_before_10_install-debian-packages.tmpl b/home/.chezmoiscripts/debian/run_onchange_before_10_install-debian-packages.tmpl
index 4d27103..01a429d 100644
--- a/home/.chezmoiscripts/debian/run_onchange_before_10_install-debian-packages.tmpl
+++ b/home/.chezmoiscripts/debian/run_onchange_before_10_install-debian-packages.tmpl
@@ -12,7 +12,7 @@ if ! command -v brew >/dev/null 2>&1; then
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 fi
 
-{{ if eq .host.arch "arm64" -}}
+{{- if eq .host.arch "arm64" }}
 eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)
 {{- else }}
 eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)
diff --git a/home/.chezmoitemplates/debian/brewfile b/home/.chezmoitemplates/debian/brewfile
index 9950518..26d9839 100644
--- a/home/.chezmoitemplates/debian/brewfile
+++ b/home/.chezmoitemplates/debian/brewfile
@@ -28,6 +28,7 @@
   "tmux"
   "yq"
   "sqlite"
+  "zsh"
 ) -}}
 
 {{- if .toolchains.iac -}}
diff --git a/home/dot_zshenv b/home/dot_zshenv
index 96de268..edd8df0 100644
--- a/home/dot_zshenv
+++ b/home/dot_zshenv
@@ -1 +1,2 @@
-export ZDOTDIR=$HOME/.config/zsh/
+ZDOTDIR=$HOME/.config/zsh/
+source -- "$ZDOTDIR"/.zshrc
diff --git a/home/private_dot_config/zsh/dot_zshrc.tmpl b/home/private_dot_config/zsh/dot_zshrc.tmpl
index a0a9c52..8b84721 100644
--- a/home/private_dot_config/zsh/dot_zshrc.tmpl
+++ b/home/private_dot_config/zsh/dot_zshrc.tmpl
@@ -15,7 +15,7 @@
 
 export HOMEBREW_NO_AUTO_UPDATE=1
 
-{{ if eq .chezmoi.os "linux" -}}
+{{- if eq .chezmoi.os "linux" }}
 eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 {{- end }}