Skip to content

Commit

Permalink
fix issues with Codespace deployments
Browse files Browse the repository at this point in the history
  • Loading branch information
jls5177 committed Jul 23, 2022
1 parent cf0a4c0 commit 8394d21
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
12 changes: 8 additions & 4 deletions home/.chezmoi.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,14 @@
// See: https://raw.githubusercontent.com/benmezger/dotfiles/150e1d16faa0a975e110ae9f10745c15be79b186/.chezmoi.yaml.tmpl
// finish defining what is important to me and templating from EVs, Prompts, or default values
{{- if (env "ASK") }}
{{- $minimal = promptBool "minimal (skip Brew bundle)" -}}

{{- $name = promptString "full name" $name -}}
{{- $email = promptString "email" $email -}}
{{- $minimal = promptBool "minimal (skip Brew bundle)" -}}

{{- $name = promptString "full name" $name -}}
{{- $email = promptString "email" $email -}}
{{/* Add defaults for when ASK is not provided */}}
{{- else if (or (eq (env "GITHUB_USER") "jls5177") (has (env "USER") (list "simoju" "simonjus"))) -}}
{{- $name = get . "name" | default "Justin Simon" -}}
{{- $email = get . "email" | default "[email protected]" -}}
{{- end -}}

{{- if not $headless -}}
Expand Down
2 changes: 1 addition & 1 deletion home/.chezmoiignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Brewfile-Amzn
Brewfile-Darwin-arm64

{{/* Deploy Amazon specific configs if email matches domain */}}
{{- if not (hasSuffix "@amazon.com" .email) }}
{{- if not (and (hasKey . "email") (hasSuffix "@amazon.com" .email)) }}
.config/zsh/brazil.zshrc
.config/zsh/sam_toolkit.zshrc
.config/zsh/midway.zshrc
Expand Down
3 changes: 2 additions & 1 deletion home/run_once_fzf-installer.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ IFS=$'\n\t'

{{ if stat (joinPath .chezmoi.homeDir ".fzf" "install") }}
# Install script hash: {{ include (joinPath .chezmoi.homeDir ".fzf" "install") | sha256sum }}
~/.fzf/install

~/.fzf/install --no-update-rc --completion --key-bindings
{{ else }}
echo "WARNING: FZF installer not found"
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion home/run_once_install-packages.sh.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ run_bundle "${HOME_ROOT}/Brewfile-Darwin-arm64"
{{end}}

# Install Amzn homebrew packages
{{ if (hasSuffix "@amazon.com" .email) }}
{{- if (and (hasKey . "email") (hasSuffix "@amazon.com" .email)) }}
log::status "Installing Amzn Homebrew packages"

# Amzn Brewfile hash: {{ include "Brewfile-Amzn" | sha256sum }}
Expand Down
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set -euo pipefail
LOGFILE="/tmp/dotfiles.log"

echo "Running '$0' $(date)" | tee -a $LOGFILE
DOTFILES_MINIMAL=1 make all
DOTFILES_MINIMAL=1 make

0 comments on commit 8394d21

Please sign in to comment.