Separate bash-it specific loading of capi config

* Add a "lib" directory. This is intended to only store (but not
configure) capi aliases & environment-variables & scripts
* Load all the lib suff in a bash-it plugin to not break existing
workstations

bash-it/shell-prompt-settings.bash

@@ -0,0 +1,3 @@
+# shell prompt settings
+export HISTTIMEFORMAT="%F %T "
+export THEME_CLOCK_CHAR="⛅️ "

install.sh

@@ -30,7 +30,6 @@ source ./install-core.sh
 # bash-it / terminal
 source ./setup/bash.sh
 source ./setup/bash-it.sh
-source ./setup/custom-bash-it-plugins.sh
 source ./setup/iterm2.sh
 source ./setup/vim.sh
 source ./setup/tmux.sh

lib/aliases.bash

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+alias vim=nvim
+
+# fasd
+alias v='fasd -e vim'
+[ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh
+
+# ruby
+alias b='bundle exec'
+alias bake='echo "bundling..." && bundle install --quiet && echo "done bundling" && bundle exec rake'
+alias pgbake='echo "bundling..." && bundle install --quiet && echo "done bundling" && DB=postgres bundle exec rake'
+alias mybake='echo "bundling..." && bundle install --quiet && echo "done bundling" && DB=mysql bundle exec rake'
+
+# k8s
+alias k=kubectl
+
+# Git aliases
+alias gd='git diff'
+alias gdc='git diff --cached'
+alias gst='git status'

lib/capi-env.bash → lib/environment-variables.bash

@@ -1,6 +1,4 @@
-# shell prompt settings
-export HISTTIMEFORMAT="%F %T "
-export THEME_CLOCK_CHAR="⛅️ "
+export BOSH_SHA2=true
 
 # Set nvim as default editor
 export GIT_EDITOR=nvim
@@ -20,4 +18,4 @@ export PATH="/usr/local/opt/python/libexec/bin:$PATH"
 # specify locale so vim will stop shouting
 export LC_ALL=en_US.UTF-8
 
-launchctl setenv PATH $PATH
+launchctl setenv PATH $PATH

lib/capi-aliases.bash → lib/misc.bash

@@ -1,17 +1,9 @@
-#FASD
-alias v='fasd -e vim'
-[ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh
-
-alias b='bundle exec'
-alias bake='echo "bundling..." && bundle install --quiet && echo "done bundling" && bundle exec rake'
-alias pgbake='echo "bundling..." && bundle install --quiet && echo "done bundling" && DB=postgres bundle exec rake'
-alias mybake='echo "bundling..." && bundle install --quiet && echo "done bundling" && DB=mysql bundle exec rake'
-alias k=kubectl
-
-# Git aliases
-alias gd='git diff'
-alias gdc='git diff --cached'
-alias gst='git status'
+# I believe most of these may be specific to one CAPI member
+# Holding them all here until we can figure something out
+#
+# For example, what if we provided folks a "user/" folder like
+# Luan's vim config, where they can put their custom bits
+# -------------------------------------------------------------
 
 # capi likes `alias g="git status"`, other teams like `alias g=git`, so do both:
 alias g  >/dev/null 2>&1 && unalias g
@@ -24,7 +16,6 @@ function g() {
 }
 
 # Misc aliases
-alias fl="fly -t ci login -c https://ci.cli.fun -n main -b"
 alias cfu="seed_users"
 alias where_my_bosh_lites_at="print_env_info"
 alias bosh_lites="print_env_info"
@@ -55,4 +46,4 @@ function let_me_pull() {
     git remote set-url origin --push "${ssh_url}"
     git remote -v
     echo 'success!'
-}
+}

setup/bash-it.sh

@@ -36,3 +36,7 @@ enable_bash_it_completion ssh
 
 enable_bash_it_alias bundler
 enable_bash_it_alias git
+
+for filepath in ~/workspace/capi-workspace/custom-bash-it-plugins/*; do
+	enable_custom_bash_it_plugin $filepath
+done