Minor .bashrc and .profile clean up

Author: fortes

stowed-files/bash/.aliases

@@ -71,6 +71,9 @@ fi
 if command_exists bat; then
   alias batcat='bat'
 fi
+if command_exists eza; then
+  alias exa='eza'
+fi
 
 if command_exists code; then
   # Override Mac's default storage dir to match Linux
@@ -79,5 +82,6 @@ fi
 
 # Load local file if present
 if [ -f ~/.aliases.local ]; then
+  # shellcheck source=/dev/null
   . ~/.aliases.local
 fi

stowed-files/bash/.bashrc

@@ -1,24 +1,19 @@
 # vim: ft=sh
 
-# If not running interactively, don't do anything
+# If not running interactively, don't do anything here. Anything
+# needed in non-interactive shells goes in `.profile`
 case $- in
     *i*) ;;
       *) return;;
 esac
 
-# Glorious editor
-set -o vi
-
 # Make sure we have always loaded ~/.profile, which can get lost
 # shellcheck source=/dev/null
 source "$HOME/.profile"
 
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
 
-# Clear C-w binding in order to re-bind in .inputrc
-stty werase undef
-
 HISTFILE=$HOME/.bash_history
 # Never forget
 HISTFILESIZE=-1
@@ -156,20 +151,27 @@ if command_exists zoxide; then
   eval "$(zoxide init bash --hook pwd)"
 fi
 
-FD_COMMAND="fd"
-if ! command_exists "${FD_COMMAND}"; then
-  # Debian uses `fdfind`
-  FD_COMMAND="fdfind"
-fi
-export FD_COMMAND
-
 BAT_COMMAND="bat"
 if ! command_exists "${BAT_COMMAND}"; then
   # Debian uses `batcat`
   BAT_COMMAND="batcat"
 fi
 export BAT_COMMAND
 
+EZA_COMMAND="eza"
+if ! command_exists "${EZA_COMMAND}"; then
+  # Debian uses `exa` until `eza` is available
+  EZA_COMMAND="exa"
+fi
+export EZA_COMMAND
+
+FD_COMMAND="fd"
+if ! command_exists "${FD_COMMAND}"; then
+  # Debian uses `fdfind`
+  FD_COMMAND="fdfind"
+fi
+export FD_COMMAND
+
 fzf_preview_command=""
 if command_exists pistol; then
   fzf_preview_command="'pistol {}'"
@@ -188,12 +190,14 @@ if command_exists "${FD_COMMAND}"; then
   export FZF_CTRL_T_COMMAND="fd_with_git"
   export FZF_ALT_C_COMMAND="${FD_COMMAND} --type directory --hidden --color always"
 fi
-if command_exists exa; then
+
+if command_exists "${EZA_COMMAND}"; then
   # Show tree structure in preview window
   export FZF_ALT_C_OPTS="
-    --preview 'exa --tree --all {}'
+    --preview '${EZA_COMMAND} --tree --all {}'
     "
 fi
+
 export FZF_DEFAULT_OPTS="
   --ansi
   --bind 'ctrl-alt-a:select-all'
@@ -209,9 +213,6 @@ export FZF_CTRL_T_OPTS="
   "
 export FZF_COMPLETION_OPTS='--smart-case'
 
-# Use wayland for Firefox
-export MOZ_ENABLE_WAYLAND=1
-
 # FZF keybindings (Debian)
 source_if_exists "/usr/share/doc/fzf/examples/key-bindings.bash"
 # FZF keybindings (Homebrew)
@@ -221,9 +222,6 @@ if command_exists fnm; then
   eval "$(fnm env)"
 fi
 
-# Opt-out of Eternal Terminal telemetry
-export ET_NO_TELEMETRY=1
-
 # Load system bash completion
 source_if_exists "/etc/bash_completion"
 # Load Homebrew bash completion, see https://docs.brew.sh/Shell-Completion

stowed-files/bash/.profile

@@ -56,9 +56,6 @@ fi
 # Locally-installed packages belong in path
 add_to_path "$HOME/.local/bin"
 
-# Make sure to use system for virsh by default
-export LIBVIRT_DEFAULT_URI="qemu:///system"
-
 if [ -z "${XDG_CONFIG_HOME:-}" ]; then
   export XDG_CONFIG_HOME="$HOME/.config"
 fi
@@ -71,6 +68,15 @@ if [ -z "${XDG_DOWNLOAD_DIR:-}" ]; then
   fi
 fi
 
+# Opt-out of Eternal Terminal telemetry
+export ET_NO_TELEMETRY=1
+
+# Make sure to use system for virsh by default
+export LIBVIRT_DEFAULT_URI="qemu:///system"
+
+# Use wayland for Firefox
+export MOZ_ENABLE_WAYLAND=1
+
 # Rg, for whatever reason, needs to manually specify location for config
 export RIPGREP_CONFIG_PATH="$XDG_CONFIG_HOME/ripgrep/rc"