feat(zsh): Resolve issues with ZSH + runner

sylus · Feb 23, 2024 · c2bf20a · c2bf20a
1 parent 8d85afa
commit c2bf20a
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 7 deletions.
diff --git a/.github/workflows/github.yaml b/.github/workflows/github.yaml
@@ -76,5 +76,16 @@ jobs:
                   HOMEBREW_NO_INSTALL_CLEANUP: 1
               run: ./install.sh
 
-            - name: Run tests
-              run: ~/.local/bin/check-dotfiles
+            - name: Switch to ZSH
+              if: runner.os == 'Linux'
+              shell: /home/linuxbrew/.linuxbrew/bin/zsh {0}
+              run: |
+                source ~/.zshenv
+                ~/.local/bin/check-dotfiles
+
+            - name: Switch to ZSH
+              if: runner.os == 'macOS'
+              shell: /opt/homebrew/bin/zsh {0}
+              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
@@ -1,7 +1,15 @@
 #!/usr/bin/env bash
 
+# Install XCode
 xcode-select -p >/dev/null 2>&1 || xcode-select --install
 
+# Install Visual Studio Code
+# curl -o vscode.zip -L https://code.visualstudio.com/sha/download?build=stable&os=darwin-universal
+# unzip -q vscode.zip
+# rm vscode.zip
+# mv "Visual Studio Code.app" /Applications/
+# export PATH="\$PATH:/Applications/Visual Studio Code.app/Contents/Resources/app/bin"
+
 if ! command -v brew >/dev/null 2>&1; then
   echo "Installing Homebrew..."
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
@@ -17,6 +25,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/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-packages.tmpl b/home/.chezmoiscripts/ubuntu/run_onchange_before_10_install-ubuntu-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/darwin/brewfile b/home/.chezmoitemplates/darwin/brewfile
@@ -75,7 +75,6 @@
   "qlstephen"
   "slack"
   "spectacle"
-  "visual-studio-code"
 -}}
 
 {{- range ($taps | sortAlpha | uniq) }}

diff --git a/home/.chezmoitemplates/universal/packages b/home/.chezmoitemplates/universal/packages
@@ -30,6 +30,7 @@
   "watch"
   "wget"
   "zplug"
+  "zsh"
   "zsh-autosuggestions"
   "zsh-syntax-highlighting"
 -}}

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 }}
 
@@ -139,6 +139,14 @@ export NVM_DIR="$HOME/.nvm"
 
 ln -sf "$(brew --prefix)/bin/python"{3,}
 
+{{ if eq .chezmoi.os "darwin" -}}
+# Visual Studio Code Configuration
+# -----------------------------------------------------------------------------
+
+# Add Visual Studio Code (code)
+export PATH="\$PATH:/Applications/Visual Studio Code.app/Contents/Resources/app/bin"
+{{- end }}
+
 # Includes
 # -----------------------------------------------------------------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
       "watch"
       "wget"
       "zplug"
+      "zsh"
       "zsh-autosuggestions"
       "zsh-syntax-highlighting"
     -}}
@@ Expand Down @@