test

sylus · Feb 22, 2024 · 81632fd · 81632fd
1 parent 8d85afa
commit 81632fd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -17,6 +17,7 @@ brew update
 
 # Temporary Overrides
 brew install --overwrite [email protected]
+brew install --overwrite [email protected]
 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
@@ -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
@@ -28,6 +28,7 @@
   "tmux"
   "yq"
   "sqlite"
+  "zsh"
 ) -}}
 
 {{- if .toolchains.iac -}}

diff --git 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
@@ -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 }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ @@
       "tmux"
       "yq"
       "sqlite"
+      "zsh"
     ) -}}
     {{- if .toolchains.iac -}}
@@ Expand Down @@