fix: improve shell config

Author: seantrane

shell/aliases.sh

@@ -6,6 +6,12 @@
 # Reload the shell (i.e. invoke as a login shell)
 alias reload="exec $SHELL -l"
 
+function chshell {
+  grep -q "${HOMEBREW_PREFIX:-}/bin/${1:-zsh}" "/etc/shells" \
+    || echo "${HOMEBREW_PREFIX:-}/bin/${1:-zsh}" >> /etc/shells
+  chsh -s "${HOMEBREW_PREFIX:-}/bin/${1:-zsh}"
+}
+
 # Easier navigation: .., ..., ...., ....., ~ and -
 alias ..="cd .."
 alias ...="cd ../.."

shell/exports.sh

@@ -1,7 +1,6 @@
 # shellcheck shell=bash disable=SC1090,SC1091
 #
 # EXPORTS
-#
 # Defines exports/variables for bash scripting environment.
 
 #-------------------------------------------------------------------------------

shell/ls_colors.sh

@@ -17,7 +17,7 @@ fi
 # Use GNU ls, if installed by Homebrew.
 # Always use color output for `ls`.
 if [[ -r "${HOMEBREW_PREFIX:-}/bin/gls" ]]; then
-  alias ls="command ${HOMEBREW_PREFIX:-}/bin/gls ${colorflag}"
+  alias ls="command ${HOMEBREW_PREFIX:-}/bin/gls --color=always --group-directories-first"
 else
   alias ls="command ls ${colorflag}"
 fi

shell/paths.sh

@@ -1,7 +1,6 @@
-# shellcheck shell=bash
+# shellcheck shell=bash disable=SC1090,SC1091
 #
 # PATH / MANPATH exports
-#
 # Defines the $PATH export/variable for shell environments.
 
 type "find_files" &> /dev/null || . "$DOTFILES/functions/find_files"
@@ -32,19 +31,22 @@ export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
 
 # LOAD DOTFILES PATHS:
 # for file in ~/.dotfiles/{git,system}/path.sh; do
-_find_files_array=($(find -H "$DOTFILES" -maxdepth 2 -perm -u+r -type f -name 'path.sh'))
-for _file_path in "${_find_files_array[@]}"; do
-  . "$_file_path"
-done
-unset _file_path _find_files_array
+for _file in $(find_files "$DOTFILES" 'path.sh' 2); do . "$_file"; done; unset _file
 
 # CUSTOM/USER PATHS
 # `~/.path` can be used to extend `$PATH`.
-# shellcheck disable=SC1090
 [[ -f "$HOME/.path" ]] && . "$HOME/.path"
 
-# Ensure Homebrew path comes first
-export PATH="/opt/homebrew/bin:$PATH"
+#-------------------------------------------------------------------------------
+# HOMEBREW
+#-------------------------------------------------------------------------------
+
+# Homebrew init.
+[[ -f "$DOTFILES/brew/init_install.sh" ]] && . "$DOTFILES/brew/init_install.sh" \
+  && _init_homebrew
+
+# Homebrew path must come first to override system binaries.
+export PATH="${HOMEBREW_PREFIX:-/usr/local}/bin:$PATH"
 
 #-------------------------------------------------------------------------------
 # HELP DOCS/MANUALS

system/aliases.sh

@@ -11,9 +11,6 @@ alias dt="cd ~/Desktop"
 alias h="history"
 alias j="jobs"
 
-# Get macOS Software Updates, and update installed Ruby gems, Homebrew, npm, and their installed packages
-alias update='(cd; sudo softwareupdate -i -a; brew update; brew upgrade; brew cleanup; npm cache clean -g -f; npm install -g npm@latest; npm update -g; npm cache clean -g -f; sudo gem update --system; sudo gem update)'
 alias brewupdate='brew update; brew upgrade; brew cleanup'
-alias macupdate='sudo softwareupdate -i -a'
 alias nodeupdate='(cd; npm cache clean -g -f; brew update node --without-npm; npm install -g npm@latest; npm update -g; npm cache clean -g -f)'
 alias rubyupdate='sudo gem update --system; sudo gem update'

user/aliases.sh

@@ -1,6 +1,4 @@
-# shellcheck shell=bash
-#
-#
+# shellcheck shell=bash disable=SC2139
 
 ################################################################################
 # Homebrew aliases
@@ -22,11 +20,11 @@ alias brew_update="brew update; brew upgrade; brew cleanup"
 # Docker Compose
 #-------------------------------------------------------------------------------
 
-alias dockerc="docker-compose"
-alias dkrup="docker-compose stop < /dev/null 2> /dev/null; docker-compose up --build"
-alias dkrstop="docker-compose stop < /dev/null 2> /dev/null"
-alias dkroff="docker ps; docker-compose stop < /dev/null 2> /dev/null; docker rm -f \"$(docker ps -a -q < /dev/null 2> /dev/null)\" < /dev/null 2> /dev/null; docker ps -a"
-alias dkr0="docker images; docker-compose stop < /dev/null 2> /dev/null; docker rmi -f \"$(docker images -a -q < /dev/null 2> /dev/null)\" < /dev/null 2> /dev/null; docker images"
+alias dockerc="docker compose"
+alias dkrup="docker compose stop < /dev/null 2> /dev/null; docker compose up --build"
+alias dkrstop="docker compose stop < /dev/null 2> /dev/null"
+alias dkroff="docker ps; docker compose stop < /dev/null 2> /dev/null; docker rm -f \"$(docker ps -a -q < /dev/null 2> /dev/null)\" < /dev/null 2> /dev/null; docker ps -a"
+alias dkr0="docker images; docker compose stop < /dev/null 2> /dev/null; docker rmi -f \"$(docker images -a -q < /dev/null 2> /dev/null)\" < /dev/null 2> /dev/null; docker images"
 
 ################################################################################
 # Jekyll (and Bundler) aliases