From cb23abe6d0ae40082985fbc9ed610317c9945371 Mon Sep 17 00:00:00 2001 From: Joe Lillibridge Date: Wed, 30 Oct 2024 07:41:19 -0500 Subject: [PATCH] wip --- .config/zsh/aliases | 1 - .config/zsh/environment##template | 2 ++ .zprofile | 16 +++++++++++++++- .zprofile.local##class.Work | 2 ++ 4 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 .zprofile.local##class.Work diff --git a/.config/zsh/aliases b/.config/zsh/aliases index 0995405..0c5c133 100644 --- a/.config/zsh/aliases +++ b/.config/zsh/aliases @@ -57,7 +57,6 @@ if [ "$system_type" = "Darwin" ]; then # Open iTerm from VS Code terminal # May refactor this to make the alias available in all non-iTerm terminals [ ! -v "$IN_VS_CODE_TERMINAL" ] && alias iterm="open -a iTerm" - fi if [ -e ./aliases.local ]; then diff --git a/.config/zsh/environment##template b/.config/zsh/environment##template index abc63fa..ebbd7ed 100644 --- a/.config/zsh/environment##template +++ b/.config/zsh/environment##template @@ -10,6 +10,8 @@ export ZDOTDIR=${ZDOTDIR:-$HOME/.config/zsh} export ZPLUGINDIR=${ZPLUGINDIR:-${ZDOTDIR}/plugins} export NVM_DIR=$HOME/.nvm +[[ "$(command -v bat)" ]] && export PAGER="bat -p" + {% if yadm.os == "Darwin" %} export CLICOLOR=1 export HOMEBREW_BUNDLE_DUMP_NO_VSCODE=1 diff --git a/.zprofile b/.zprofile index 6b27a6c..79717e4 100644 --- a/.zprofile +++ b/.zprofile @@ -1 +1,15 @@ -eval "$(/opt/homebrew/bin/brew shellenv)" +system_type=$(uname -s) + +# eval "$(/opt/homebrew/bin/brew shellenv)" + +if [ "$system_type" = "Darwin" ]; then + # Set up Homebrew + local BREW=/opt/homebrew/bin/brew + if [ -x $BREW ]; then + eval "$($BREW shellenv)" + fi +fi + +if [ -e ~/.zprofile.local ]; then + source ~/.zprofile.local +fi diff --git a/.zprofile.local##class.Work b/.zprofile.local##class.Work new file mode 100644 index 0000000..da7814a --- /dev/null +++ b/.zprofile.local##class.Work @@ -0,0 +1,2 @@ +# Set up 1Password Agent for SSH +export SSH_AUTH_SOCK=~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock