diff --git a/home/.chezmoi.yaml.tmpl b/home/.chezmoi.yaml.tmpl index ffd2c02..5b89118 100644 --- a/home/.chezmoi.yaml.tmpl +++ b/home/.chezmoi.yaml.tmpl @@ -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 "jls5177@gmail.com" -}} {{- end -}} {{- if not $headless -}} diff --git a/home/.chezmoiignore b/home/.chezmoiignore index 2524e9c..7057bf3 100644 --- a/home/.chezmoiignore +++ b/home/.chezmoiignore @@ -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 diff --git a/home/run_once_fzf-installer.sh.tmpl b/home/run_once_fzf-installer.sh.tmpl index 753a3a9..a90c45f 100644 --- a/home/run_once_fzf-installer.sh.tmpl +++ b/home/run_once_fzf-installer.sh.tmpl @@ -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 }} diff --git a/home/run_once_install-packages.sh.tmpl b/home/run_once_install-packages.sh.tmpl index fa50c69..65394fe 100644 --- a/home/run_once_install-packages.sh.tmpl +++ b/home/run_once_install-packages.sh.tmpl @@ -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 }} diff --git a/install.sh b/install.sh index e5df2a6..3432acd 100755 --- a/install.sh +++ b/install.sh @@ -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