TEST

sylus · Feb 23, 2024 · 32ff316 · 32ff316
1 parent 95d80f5
commit 32ff316
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/github.yaml b/.github/workflows/github.yaml
@@ -85,7 +85,9 @@ jobs:
 
             - name: Switch to ZSH
               if: runner.os == 'macOS'
-              shell: /opt/homebrew/bin/zsh {0}
+              shell: /usr/local/bin/zsh {0}
               run: |
                 source ~/.zshenv
+                echo "TEST"
+                echo "$PATH"
                 ~/.local/bin/check-dotfiles
diff --git a/home/.chezmoitemplates/universal/packages b/home/.chezmoitemplates/universal/packages
@@ -1,6 +1,7 @@
 {{- $packages := list
   "ack"
   "age"
+  "awk"
   "bash"
   "bat"
   "cmake"

diff --git a/home/private_dot_config/shell/dot_bash_exports.tmpl b/home/private_dot_config/shell/dot_bash_exports.tmpl
@@ -75,15 +75,19 @@ export ZSH_EVALCACHE_DIR="$XDG_CACHE_HOME/zsh-evalcache"
 
 # GPG
 # https://stackoverflow.com/a/42265848/96656
+{{- if not .host.headless }}
 export GPG_TTY=$(tty);
+{{- end }}
 
 # Hyper
 {{- if eq .host.distro.family "darwin" }}
+{{- if not .host.headless }}
 launchctl setenv XDG_CONFIG_HOME "$XDG_CONFIG_HOME"
 launchctl setenv XDG_DATA_HOME "$XDG_DATA_HOME"
 launchctl setenv XDG_CACHE_HOME "$XDG_CACHE_HOME"
 launchctl setenv PATH "$PATH"
 {{- end }}
+{{- end }}
 
 # NodeJS
 export NODE_REPL_HISTORY_SIZE='32768';

diff --git a/home/private_dot_config/zsh/dot_zshrc.tmpl b/home/private_dot_config/zsh/dot_zshrc.tmpl
@@ -20,7 +20,11 @@ eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
 {{- end }}
 
 {{ if eq .chezmoi.os "darwin" -}}
+{{ if eq .host.arch "arm64" -}}
 eval "$(/opt/homebrew/bin/brew shellenv)"
+{{- else }}
+eval "$(/usr/local/bin/brew shellenv)"
+{{- end }}
 {{- end }}
 
 # Powerlevel10k Configuration
@@ -131,8 +135,6 @@ setopt rm_star_silent
 # -----------------------------------------------------------------------------
 
 export NVM_DIR="$HOME/.nvm"
-[ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"
-[ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm"
 
 # Python Configuration
 # -----------------------------------------------------------------------------
@@ -165,6 +167,7 @@ if [ -f "$HOME"/.config/shell/.bash_functions ]; then
     \. "$HOME"/.config/shell/.bash_functions
 fi
 
+{{- if eq .chezmoi.os "linux" }}
 {{- if .toolchains.kubernetes }}
 # Load cross-compatible Kubernetes alias definitions from separate file.
 if [ -f "$HOME"/.config/kubernetes/.kube_aliases ]; then
@@ -176,3 +179,4 @@ if [ -f "$HOME"/.config/kubernetes/.kube_functions ]; then
     \. "$HOME"/.config/kubernetes/.kube_functions
 fi
 {{- end }}
+{{- end }}
-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     {{- $packages := list
       "ack"
       "age"
+      "awk"
       "bash"
       "bat"
       "cmake"
@@ Expand Down @@