Minor modification and fixes of bash_completion on MacOS

1 files changed, 11 insertions, 6 deletions

diff --git a/.bash_profile b/.bash_profile
index a29f021..9ee3856 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,30 +1,36 @@
 #!/bin/bash
 # shellcheck disable=SC1091
 
-# ==== Homebrew Apple M1/Intel fixing of $PATH
+# Homebrew Apple M1/Intel fixing of $PATH and loading bash_completion
 if [ -d /opt/homebrew ]; then
   eval "$(/opt/homebrew/bin/brew shellenv)"
+  source "/opt/homebrew/etc/bash_completion"
 elif [ -d /usr/local/Homebrew ]; then
   eval "$(/usr/local/Homebrew/bin/brew shellenv)"
+  source "/usr/local/Homebrew/etc/bash_completion"
 fi
 
-# ==== *nix include bashrc if found and override here
+# *nix include bashrc if found and override here
 if [ -f "$HOME/.bashrc" ]; then
   source "$HOME/.bashrc"
 fi
 
 export CLICOLOR=1
-export LSCOLORS=gxfxcxdxbxegedabagacad # Mac OS custorm colors (not LS_COLORS as unix) defaultscheme "exfxcxdxbxegedabagacad"
-export LS_COLORS="$LS_COLORS:di=00;36:ln=00;35:ex=00;31" # Unix/Bash Readline custom colors
+# Mac OS custorm colors (not LS_COLORS as unix) defaultscheme "exfxcxdxbxegedabagacad"
+export LSCOLORS=gxfxcxdxbxegedabagacad
+# Unix/Bash Readline custom colors (created by dircolors in bashrc)
+export LS_COLORS="$LS_COLORS:di=00;36:ln=00;35:ex=00;31"
+
 export IGNOREEOF=42 # Ignore Ctrl+D logout terminal session
 export HISTSIZE=1000 # Num commands to remmember in a terminal session
 export HISTFILESIZE=10000 # Max number of linse in history file
 export HISTFILE="$HOME/.bash_history"
 export HISTCONTROL=ignoredups:erasedups
+
 export EDITOR='vim'
 export TERM="xterm-256color"
 export GREP_OPTIONS="--color=auto"
-export PS1="[\u]: \W \$ "
+export PS1="[\h]: \W \$ "
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 GPG_TTY=$(tty)
@@ -33,7 +39,6 @@ unset SSH_AGENT_PID
 SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 export SSH_AUTH_SOCK
 export BASH_SILENCE_DEPRECATION_WARNING=1 # Silence new macOS warning about bash
-export USE_GKE_GCLOUD_AUTH_PLUGIN=True
 
 # ==== Shell Opts
 shopt -s checkwinsize  # check the window size after each command and, if necessary, update LINES/COLUMNS