From b9ff738a8890b7bf4a9f28ab7e208f2a1af561e7 Mon Sep 17 00:00:00 2001
From: Taylor Bockman <tbockman@xchg.sh>
Date: Sat, 21 Dec 2019 17:52:51 -0800
Subject: [PATCH] Move around exports, add sourcing for bashrc in bash_profile

---
 dotfiles/bash/bash_profile |  4 ++++
 dotfiles/bash/bashrc       | 26 ++++++++++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/dotfiles/bash/bash_profile b/dotfiles/bash/bash_profile
index e69de29..0dca161 100644
--- a/dotfiles/bash/bash_profile
+++ b/dotfiles/bash/bash_profile
@@ -0,0 +1,4 @@
+if [[ -f ~/.bashrc ]]; then
+  source ~/.bashrc
+fi
+
diff --git a/dotfiles/bash/bashrc b/dotfiles/bash/bashrc
index 4b457b1..db0250d 100644
--- a/dotfiles/bash/bashrc
+++ b/dotfiles/bash/bashrc
@@ -51,18 +51,6 @@ weather() {
 
 # ------------------ END FUNCTIONS ------------------ #
 
-# -------------- EXPORTS --------------#
-
-export CC=$(which clang)
-export CXX=$(which clang++)
-export OPENSSL_ROOT_DIR=$(which openssl)
-export PATH="/usr/local/opt/openjdk/bin:$PATH"
-
-# Ignore duplicates in history to make history less of a hassle to use.
-export HISTCONTROL=ignoredups
-
-# ------------ END EXPORTS ------------#
-
 
 # ---------------- ALIASES ----------------#
 
@@ -78,6 +66,20 @@ alias vim='nvim'
 # -------------- END ALIASES --------------#
 
 
+# -------------- EXPORTS --------------#
+
+export EDITOR=vim
+export CC=$(which clang)
+export CXX=$(which clang++)
+export OPENSSL_ROOT_DIR=$(which openssl)
+export PATH="/usr/local/opt/openjdk/bin:$PATH"
+
+# Ignore duplicates in history to make history less of a hassle to use.
+export HISTCONTROL=ignoredups
+
+# ------------ END EXPORTS ------------#
+
+
 # ----------------------------------------- INITIALIZATIONS -------------------------------------- #
 
 if which pyenv-virtualenv-init > /dev/null; then eval "$(pyenv virtualenv-init -)"; fi