diff options
author | Mike Crute <mike@crute.us> | 2021-11-02 19:18:08 -0700 |
---|---|---|
committer | Mike Crute <mike@crute.us> | 2021-11-02 19:18:08 -0700 |
commit | a291adacf6ca679ac578ec0744c936698c87cc9e (patch) | |
tree | c74b8124dc4a6bfc32f54953f6ae10a60ef93eed | |
parent | 23dddf2d51c528b4957a57de98412ff6d1b60ad9 (diff) | |
download | dotfiles-a291adacf6ca679ac578ec0744c936698c87cc9e.tar.bz2 dotfiles-a291adacf6ca679ac578ec0744c936698c87cc9e.tar.xz dotfiles-a291adacf6ca679ac578ec0744c936698c87cc9e.zip |
Add macOS settings to bashrc
-rw-r--r-- | .bashrc | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -240,6 +240,11 @@ if [ "$(uname)" == "Darwin" ]; then | |||
240 | unset KRB5CCNAME | 240 | unset KRB5CCNAME |
241 | fi | 241 | fi |
242 | 242 | ||
243 | # | ||
244 | # Silence macOS Presumtive Warnings | ||
245 | # | ||
246 | export BASH_SILENCE_DEPRECATION_WARNING=1 | ||
247 | |||
243 | 248 | ||
244 | # | 249 | # |
245 | # Ruby and RVM Setup | 250 | # Ruby and RVM Setup |
@@ -426,7 +431,8 @@ alias tmux-darken="tmux set-environment -g TERM_BG_SHADE dark" | |||
426 | 431 | ||
427 | # ls Aliases | 432 | # ls Aliases |
428 | # Color flags a different between BSD ls and GNU ls | 433 | # Color flags a different between BSD ls and GNU ls |
429 | if ls --color=auto &>/dev/null; then | 434 | # If we have dircolors then we're probably linux (dircolors is in coreutils) |
435 | if have_command dircolors; then | ||
430 | eval "`dircolors -b`" | 436 | eval "`dircolors -b`" |
431 | alias ls='ls --color=auto' | 437 | alias ls='ls --color=auto' |
432 | else | 438 | else |
@@ -741,6 +747,12 @@ function man() { | |||
741 | func_export man | 747 | func_export man |
742 | 748 | ||
743 | # | 749 | # |
750 | # Configure Homebrew | ||
751 | # | ||
752 | [[ -r ~/.homebrew_github_api_token ]] && export HOMEBREW_GITHUB_API_TOKEN=$(cat ~/.homebrew_github_api_token) | ||
753 | [[ -x /opt/homebrew/bin/brew ]] && eval $(/opt/homebrew/bin/brew shellenv) | ||
754 | |||
755 | # | ||
744 | # APPLICATION SPECIFIC HACKS | 756 | # APPLICATION SPECIFIC HACKS |
745 | # | 757 | # |
746 | # Make the Oracle client and cxOracle work correctly on OS X | 758 | # Make the Oracle client and cxOracle work correctly on OS X |
@@ -752,7 +764,6 @@ for _ORACLE_HOME in "$HOME/local/lib/oracle/instantclient_10_2" "/opt/oracle/ins | |||
752 | fi | 764 | fi |
753 | done | 765 | done |
754 | 766 | ||
755 | [[ -r ~/.homebrew_github_api_token ]] && export HOMEBREW_GITHUB_API_TOKEN=$(cat ~/.homebrew_github_api_token) | ||
756 | [[ -f ~/.bashrc_local ]] && source ~/.bashrc_local | 767 | [[ -f ~/.bashrc_local ]] && source ~/.bashrc_local |
757 | 768 | ||
758 | # Getting SSH agent can be pretty slow on some systems. Do this in | 769 | # Getting SSH agent can be pretty slow on some systems. Do this in |