From b81e640cd309f4427891d047e8b6a96ccd6fb7f8 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Sat, 9 Dec 2023 12:56:12 +0000 Subject: [PATCH] Latest --- ..._onchange_after_10-configure-macos.sh.tmpl | 46 +++++++++---------- .../universal/profile-inline | 9 ++++ home/dot_config/shell/exports.sh.tmpl | 9 ++++ 3 files changed, 41 insertions(+), 23 deletions(-) diff --git a/home/.chezmoiscripts/universal/run_onchange_after_10-configure-macos.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_10-configure-macos.sh.tmpl index 7e84af53..c378e56e 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_10-configure-macos.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_10-configure-macos.sh.tmpl @@ -929,29 +929,29 @@ defaults write com.tapbots.TweetbotMac OpenURLsDirectly -bool true # Kill affected applications # ############################################################################### -for app in "Activity Monitor" \ - "Address Book" \ - "Calendar" \ - "cfprefsd" \ - "Contacts" \ - "Dock" \ - "Finder" \ - "Google Chrome Canary" \ - "Google Chrome" \ - "Mail" \ - "Messages" \ - "Opera" \ - "Photos" \ - "Safari" \ - "SizeUp" \ - "Spectacle" \ - "SystemUIServer" \ - "Transmission" \ - "Tweetbot" \ - "Twitter" \ - "iCal"; do - killall "${app}" &> /dev/null -done +# for app in "Activity Monitor" \ +# "Address Book" \ +# "Calendar" \ +# "cfprefsd" \ +# "Contacts" \ +# "Dock" \ +# "Finder" \ +# "Google Chrome Canary" \ +# "Google Chrome" \ +# "Mail" \ +# "Messages" \ +# "Opera" \ +# "Photos" \ +# "Safari" \ +# "SizeUp" \ +# "Spectacle" \ +# "SystemUIServer" \ +# "Transmission" \ +# "Tweetbot" \ +# "Twitter" \ +# "iCal"; do +# killall "${app}" &> /dev/null +# done # Set Drift as default screen saver defaults -currentHost write com.apple.screensaver moduleDict -dict moduleName Brooklyn path "/System/Library/Screen Savers/Drift.saver" diff --git a/home/.chezmoitemplates/universal/profile-inline b/home/.chezmoitemplates/universal/profile-inline index 82dca427..904fec42 100644 --- a/home/.chezmoitemplates/universal/profile-inline +++ b/home/.chezmoitemplates/universal/profile-inline @@ -21,6 +21,15 @@ if [ -d "/home/linuxbrew/.linuxbrew/bin" ]; then export MANPATH="/home/linuxbrew/.linuxbrew/share/man${MANPATH+:$MANPATH}:" export INFOPATH="/home/linuxbrew/.linuxbrew/share/info:${INFOPATH:-}" export WHALEBREW_INSTALL_PATH="/home/linuxbrew/.linuxbrew/whalebrew" +elif [ -d "$HOME/.linuxbrew/bin" ]; then + export HOMEBREW_PREFIX="$HOME/.linuxbrew" + export HOMEBREW_CELLAR="$HOME/.linuxbrew/Cellar" + export HOMEBREW_REPOSITORY="$HOME/.linuxbrew/Homebrew" + export PATH="$HOME/.linuxbrew/bin:$HOME/.linuxbrew/sbin${PATH+:$PATH}" + export MANPATH="$HOME/.linuxbrew/share/man${MANPATH+:$MANPATH}:" + export INFOPATH="$HOME/.linuxbrew/share/info:${INFOPATH:-}" + export WHALEBREW_INSTALL_PATH="$HOME/.linuxbrew/whalebrew" + eval "$("$HOME/.linuxbrew/bin/brew" shellenv)" elif [ -f "/usr/local/bin/brew" ]; then eval "$(/usr/local/bin/brew shellenv)" elif [ -f "${HOMEBREW_PREFIX:-/opt/homebrew}/bin/brew" ]; then diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl index 202fa245..9ca91418 100644 --- a/home/dot_config/shell/exports.sh.tmpl +++ b/home/dot_config/shell/exports.sh.tmpl @@ -68,6 +68,15 @@ if [ -d /home/linuxbrew/.linuxbrew/bin ]; then export MANPATH="/home/linuxbrew/.linuxbrew/share/man${MANPATH+:$MANPATH}:" export INFOPATH="/home/linuxbrew/.linuxbrew/share/info:${INFOPATH:-}" export WHALEBREW_INSTALL_PATH="/home/linuxbrew/.linuxbrew/whalebrew" +elif [ -d "$HOME/.linuxbrew/bin" ]; then + export HOMEBREW_PREFIX="$HOME/.linuxbrew" + export HOMEBREW_CELLAR="$HOME/.linuxbrew/Cellar" + export HOMEBREW_REPOSITORY="$HOME/.linuxbrew/Homebrew" + export PATH="$HOME/.linuxbrew/bin:$HOME/.linuxbrew/sbin${PATH+:$PATH}" + export MANPATH="$HOME/.linuxbrew/share/man${MANPATH+:$MANPATH}:" + export INFOPATH="$HOME/.linuxbrew/share/info:${INFOPATH:-}" + export WHALEBREW_INSTALL_PATH="$HOME/.linuxbrew/whalebrew" + eval "$("$HOME/.linuxbrew/bin/brew" shellenv)" elif [ -f /opt/homebrew/bin/brew ]; then eval $(/opt/homebrew/bin/brew shellenv) elif [ -f /usr/local/bin/brew ]; then