reorg shell config files

Author: rvenutolo

README.md

@@ -5,5 +5,5 @@ Dotfiles managed by [chezmoi](https://www.chezmoi.io/).
 ```shell
 $ sh -c "$(curl -fsLS 'get.chezmoi.io')" -- -b '.' \
   && ./chezmoi init --apply 'rvenutolo'
-  && source '~/.bash_profile'
+  && source '~/.bashrc'
 ```

dot_config/bash/alias_completion.bash

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+## NOTE TO SELF
+## This is not being used. Instead I am using: https://github.com/cykerway/complete-alias
+
 # based on:
 # http://superuser.com/questions/436314/how-can-i-get-bash-to-perform-tab-completion-for-my-aliases
 

dot_config/bash/aliases.bash

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-## sudo
+# sudo
 alias sudo='sudo '
 alias sued='sudo --edit'
 alias please='sudo $(fc -ln -1)'
 alias plz='please'
 
-## cd
+# cd
 alias cd..='cd ..'
 alias ..='cd ..'
 alias ...='cd ../..'
@@ -27,7 +27,7 @@ alias s='cl ${SCRIPTS_DIR}'
 alias d='cl ${CODE_DIR}/Personal/dotfiles'
 alias bd='cd "$OLDPWD"'
 
-## ls
+# ls
 if __executable_exists 'exa'; then
   alias exa='exa --classify --group-directories-first --icons --header --time-style=long-iso --color-scale --git'
   alias ls='exa'
@@ -64,7 +64,7 @@ else
   alias la1='ls --almost-all -1'
 fi
 
-## cp, mv, rm, mkdir, trash
+# cp, mv, rm, mkdir, trash
 alias mkdir='mkdir --parents --verbose'
 alias cp='cp --verbose'
 alias mv='mv --verbose'
@@ -75,7 +75,7 @@ else
   alias rm='rm --verbose'
 fi
 
-## chown, chmod, chgrp
+# chown, chmod, chgrp
 alias chown='chown --preserve-root'
 alias chmod='chmod --preserve-root'
 alias chax='chmod a+x'
@@ -90,35 +90,35 @@ alias 755='chmod --recursive 755'
 alias 775='chmod --recursive 775'
 alias chgrp='chgrp --preserve-root'
 
-## grep
+# grep
 alias grep="grep --exclude-dir='.*' --colour=auto"
 alias egrep='grep --extended-regexp'
 alias fgrep='grep --fixed-strings'
 
-## tar
+# tar
 alias mktar='tar --create --verbose --file'
 alias mkbz2='tar --create --verbose --bzip2 --file'
 alias mkgz='tar --create --verbose --gzip --file'
 alias untar='tar --extract --verbose --file'
 alias unbz2='tar --extract --verbose --bzip2 --file'
 alias ungz='tar --extract --verbose --gzip --file'
 
-## ps
+# ps
 alias psa='ps aux'
 alias psaf='ps auxf'
 
-## journalctl, systemctl
+# journalctl, systemctl
 alias jc='journalctl'
 alias jce='jounralctl --priority=3'
 alias sc='systemctl'
 alias scu='systemctl --user'
 
-## editors
+# editors
 alias k='kate'
 alias m='micro'
 alias n='nano'
 
-## misc - shorter alias
+# misc - shorter alias
 alias g='git'
 alias o='xdg-open'
 alias q='exit'
@@ -129,10 +129,10 @@ alias hh='hstr'
 alias ms='manswitch'
 alias cls='clear'
 
-## misc - replace commands
+# misc - replace commands
 alias which='type'
 
-## misc - adds flags
+# misc - adds flags
 alias type='type -a'
 alias du='du --total --human-readable --block-size=1K'
 alias df='df --block-size=1K --print-type --human-readable --exclude-type squashfs'
@@ -144,7 +144,7 @@ alias tree='tree -Cph --si'
 alias shfmt='shfmt --list --indent 2 --case-indent --binary-next-line --space-redirects --write'
 alias xdg-ninja='xdg-ninja --skip-unsupported'
 
-## misc - other
+# misc - other
 alias cm='chezmoi'
 alias du1='du --max-depth=1'
 alias bs='br --sizes'

dot_config/bash/exports.bash.tmpl

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+if [[ -z "${PROFILE_SOURCED-}" ]]; then
+  source "${HOME}/.profile"
+fi
+
 # if not running interactively, don't do anything
 [[ "$-" != *i* ]] && return
 
@@ -65,6 +69,17 @@ shopt -u shift_verbose
 shopt -s sourcepath
 shopt -u xpg_echo
 
+# history
+export HISTCONTROL='ignorespace:ignoredups'
+export HISTIGNORE='ls:ll:lla:pwd:bg:fg:history:h:exit:q:pwd:clear:cls:update:brc:dl:home:c'
+export HISTSIZE='100000'
+export HISTFILESIZE="${HISTSIZE}"
+export HISTTIMEFORMAT='%F %T%t'
+export HISTFILE="${XDG_STATE_HOME}/bash/history"
+if [[ ! -d "$(dirname "${HISTFILE}")" ]]; then
+  mkdir --parents "$(dirname "${HISTFILE}")"
+fi
+
 # functions used in my bash config files
 function __executable_exists() {
   type -aPf "$1" > /dev/null 2>&1
@@ -85,13 +100,13 @@ function __path_prepend() {
 # my files to source
 for file in \
   "${XDG_CONFIG_HOME}/bash/functions.bash" \
-  "${XDG_CONFIG_HOME}/bash/exports.bash" \
   "${XDG_CONFIG_HOME}/bash/aliases.bash" \
   "${XDG_CONFIG_HOME}/bash/local.bash"; do
   if __is_readable_file "${file}"; then
     source "${file}"
   fi
 done
+unset -v file
 
 # app files to source
 for file in \
@@ -103,6 +118,7 @@ for file in \
     source "${file}"
   fi
 done
+unset -v file
 
 # completions to source
 for file in \
@@ -118,22 +134,7 @@ for file in \
     source "${file}"
   fi
 done
-
-# dirs to put on path
-for dir in \
-  "$(if __executable_exists 'ruby'; then echo "$(ruby -e 'puts Gem.user_dir')/bin"; else echo ''; fi)" \
-  "$(if __executable_exists 'go'; then echo "$(go env GOPATH)/bin"; else echo ''; fi)" \
-  "$(if [[ -n "${CARGO_HOME}" ]]; then echo "${CARGO_HOME}/bin"; else echo ''; fi)" \
-  "${HOME}/.local/bin" \
-  "${SCRIPTS_DIR}/other" \
-  "${SCRIPTS_DIR}/main"; do
-  if [[ -n "${dir}" && -d "${dir}" ]]; then
-    __path_prepend "${dir}"
-  fi
-done
-
-# create dirs that may not exist (need to use `command` because `mkdir` is aliased)
-command mkdir --parents "$(dirname "${HISTFILE}")"
+unset -v file
 
 # misc init stuff
 __is_readable_file "${XDG_CONFIG_HOME}/dircolors" && eval "$(dircolors "${XDG_CONFIG_HOME}/dircolors")"
@@ -148,6 +149,8 @@ if __is_readable_file "${XDG_CONFIG_HOME}/bash/complete_alias.bash"; then
   complete -F _complete_alias "${!BASH_ALIASES[@]}"
 fi
 
+## TODO deal with this
+#export PROMPT_COMMAND='history -a; history -n'
 ## TODO submit PR to address unbound variables?
 ## TODO re-enable starship
 #STARSHIP_PREEXEC_READY=false
@@ -158,6 +161,5 @@ if __is_readable_file "${XDG_CONFIG_HOME}/bash/prompt.bash"; then
   source "${XDG_CONFIG_HOME}/bash/prompt.bash"
 fi
 
-# clean up vars & functions
-unset -v file dir shell_option initial_shell_options initial_pipefail_option
+# clean up functions
 unset -f __executable_exists __is_readable_file __path_append __path_prepend __path_remove