From 824e32b847bce1ee5a0fe0deccccd2fb0755f9db Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Wed, 13 Jun 2018 21:17:17 -0400
Subject: [PATCH 1/3] Update config

---
 bash/.profile   | 5 +++--
 tmux/.tmux.conf | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bash/.profile b/bash/.profile
index bdbb86d..670722b 100644
--- a/bash/.profile
+++ b/bash/.profile
@@ -11,12 +11,13 @@ configure_completions
 export EDITOR=vim
 
 # set history
-export HISTSIZE=10000 # very large history
+export HISTSIZE=1000 # very large history
 export HISTFILESIZE=10000 # very large history
 export HISTCONTROL=ignoreboth:erasedups # ignore duplicate history entries
 shopt -s histappend # append to the history when the shell exits (instead of overwriting)
 # save and reload history each time a command is run, to share history between shells
-export PROMPT_COMMAND="history -a; history -c; history -r"
+
+alias ssh-proxy="ssh -D 8080 galaxy"
 
 # disable messaging
 if `tty -s`; then
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index c42f17a..618ff52 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -22,7 +22,7 @@ set -g status-attr dim
 set -g status-left '#[fg=colour245] #(whoami)@#H > #S '
 set -g status-right '#[fg=colour233,bg=colour241,bold] %m/%d #[fg=colour233,bg=colour245,bold] %I:%M '
 set -g status-right-length 50
-set -g status-left-length 30
+set -g status-left-length 40
 set -g clock-mode-style 12
 
 # Use Alt-vim keys without prefix key to switch panes

From 16889bf1d2afcc92bdbb98656f82f94d1c9c72fb Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Sun, 8 Jul 2018 18:07:29 -0400
Subject: [PATCH 2/3] Add bats highlighting

---
 .gitmodules          | 3 +++
 vim/.vim/bundle/bats | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 vim/.vim/bundle/bats

diff --git a/.gitmodules b/.gitmodules
index 173d102..483e8b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "vim/.vim/bundle/vim-gitgutter"]
 	path = vim/.vim/bundle/vim-gitgutter
 	url = https://github.com/airblade/vim-gitgutter
+[submodule "vim/.vim/bundle/bats"]
+	path = vim/.vim/bundle/bats
+	url = https://github.com/vim-scripts/bats.vim
diff --git a/vim/.vim/bundle/bats b/vim/.vim/bundle/bats
new file mode 160000
index 0000000..3c283f5
--- /dev/null
+++ b/vim/.vim/bundle/bats
@@ -0,0 +1 @@
+Subproject commit 3c283f594ff8bc7fb0c25cd07ebef0f17385f94a

From da58d60002def358b963d8cd5cda6236c26dafda Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Mon, 23 Jul 2018 10:25:50 -0400
Subject: [PATCH 3/3] Wrap pyenv in existence check

---
 bash/.profile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bash/.profile b/bash/.profile
index 670722b..b0a6b7d 100644
--- a/bash/.profile
+++ b/bash/.profile
@@ -28,9 +28,12 @@ export PATH=$PATH:~/.bin
 export TERM=xterm-256color
 
 # Installed with https://github.com/pyenv/pyenv-installer
-export PATH="/home/nicholas/.pyenv/bin:$PATH"
-eval "$(pyenv init -)"
-eval "$(pyenv virtualenv-init -)"
+if [ -x "$(command -v pyenv)" ]
+then
+  export PATH="/home/nicholas/.pyenv/bin:$PATH"
+  eval "$(pyenv init -)"
+  eval "$(pyenv virtualenv-init -)"
+fi
 
 if [ -f /usr/local/etc/bash_completion ]
 then