From 56a572e55f91358279bf138ba71b5d64f2aa6164 Mon Sep 17 00:00:00 2001 From: Tony Blyler Date: Mon, 22 Aug 2022 21:16:31 -0400 Subject: [PATCH] Update asdf and fzf to work nicer with MacOS --- chezmoi/dot_tool-versions | 1 - chezmoi/dot_zshrc.d/executable_asdf.zsh | 7 +++++++ chezmoi/dot_zshrc.d/executable_fzf.zsh | 4 ++++ chezmoi/dot_zshrc.d/executable_homebrew.zsh | 1 - 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/chezmoi/dot_tool-versions b/chezmoi/dot_tool-versions index a422a5d..c1f4b37 100644 --- a/chezmoi/dot_tool-versions +++ b/chezmoi/dot_tool-versions @@ -1,4 +1,3 @@ golang 1.19 chezmoi 2.20.0 nodejs lts -aws-copilot 1.20.0 diff --git a/chezmoi/dot_zshrc.d/executable_asdf.zsh b/chezmoi/dot_zshrc.d/executable_asdf.zsh index 52e13ea..3293fce 100644 --- a/chezmoi/dot_zshrc.d/executable_asdf.zsh +++ b/chezmoi/dot_zshrc.d/executable_asdf.zsh @@ -1,5 +1,12 @@ if [ -r ~/.asdf/asdf.sh ]; then . ~/.asdf/asdf.sh +fi + +if command -v brew &> /dev/null && [ -r "$(brew --prefix)/opt/asdf/asdf.sh" ]; then + . "$(brew --prefix)/opt/asdf/asdf.sh" +fi + +if [ -n "$ASDF_DIR" ]; then # append completions to fpath fpath=(${ASDF_DIR}/completions $fpath) fi diff --git a/chezmoi/dot_zshrc.d/executable_fzf.zsh b/chezmoi/dot_zshrc.d/executable_fzf.zsh index ff04be9..9e7b53c 100644 --- a/chezmoi/dot_zshrc.d/executable_fzf.zsh +++ b/chezmoi/dot_zshrc.d/executable_fzf.zsh @@ -5,3 +5,7 @@ done 2>/dev/null for FZF_FILE in /usr/share/fzf/shell/*.zsh; do source "$FZF_FILE" done + +2>/dev/null for FZF_FILE in /opt/homebrew/opt/fzf/shell/*.zsh; do + source "$FZF_FILE" +done diff --git a/chezmoi/dot_zshrc.d/executable_homebrew.zsh b/chezmoi/dot_zshrc.d/executable_homebrew.zsh index 8124662..d110b1b 100644 --- a/chezmoi/dot_zshrc.d/executable_homebrew.zsh +++ b/chezmoi/dot_zshrc.d/executable_homebrew.zsh @@ -1,5 +1,4 @@ if command -v brew &> /dev/null; then FPATH="$(brew --prefix)/share/zsh/site-functions:${FPATH}" autoload -Uz compinit - compinit fi