Update vim plugins, add gruvbox theme

diff --git a/.gitmodules b/.gitmodules
index d1f9b137087576241ea34555b1fb0d4dd2a8f62a..df6cbd678bb22fad06636104f13e5b7f206f8eb8 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "dotvim/bundle/ctrlp.vim"]
        path = dotvim/bundle/ctrlp.vim
        url = git@github.com:ctrlpvim/ctrlp.vim.git
+[submodule "dotvim/bundle/gruvbox"]
+       path = dotvim/bundle/gruvbox
+       url = git@github.com:morhetz/gruvbox.git

diff --git a/dotbash_profile b/dotbash_profile
index bebd1c9aadc61a8bccbb3699e328ab56418d8feb..43ffd4ff4613d01ec997c321b1be77f991642c23 100644 (file)
--- a/dotbash_profile
+++ b/dotbash_profile
@@ -1,17 +1,9 @@
-export CLICOLOR=1
-export GREP_COLOR="1;36"
-export PYTHON_ENV_PATH=$HOME/env
-export PIP_REQUIRE_VIRTUALENV=true
-export POSTGRES_PATH=/Applications/Postgres.app/Contents/Versions/latest/bin
-export PATH=/usr/local/bin:~/bin:$PATH:$POSTGRES_PATH
-export EDITOR=/usr/bin/vi
-export TERM=xterm-256color
-color_prompt=yes
-
-export SCRUM_DIR=~/Documents/scrum/
+##################################################
+#
+#
+#
+##################################################
 
-export PATH=/usr/local/opt/gnu-sed/libexec/gnubin:$PATH
-export PATH=/usr/local/opt/make/libexec/gnubin:$PATH
 
 ##################################################
 #
@@ -30,6 +22,12 @@ fi
 #
 ##################################################
 
+export CLICOLOR=1
+export GREP_COLOR="1;36"
+export TERM=xterm-256color
+export THEME=gruvbox
+color_prompt=yes
+
 YELLOW=$(tput setaf 136);
 ORANGE=$(tput setaf 166);
 GREEN=$(tput setaf 64);
@@ -37,6 +35,11 @@ BLUE=$(tput setaf 33);
 BASE2=$(tput setaf 254);
 RESET=$(tput sgr0);
 
+GRUV_YELLOW=$(tput setaf 172);
+GRUV_ORANGE=$(tput setaf 166);
+GRUV_GREEN=$(tput setaf 106);
+GRUV_BLUE=$(tput setaf 66);
+
 function prompt_char {
     if ! git rev-parse --git-dir > /dev/null 2>&1; then
         echo '𝝺'
@@ -46,7 +49,22 @@ function prompt_char {
     local GIT_BRANCH=$(git branch 2>/dev/null| sed -n '/^\*/s/^\* //p')
     echo "($GIT_BRANCH) $"
 }
-export PS1='\[$ORANGE\]\u\[$RESET\] @ \[$YELLOW\]\h\[$RESET\] in \[$GREEN\]\w\[$RESET\]\n$(prompt_char) '
+
+if [[ $THEME == "solarized" ]]; then
+  YELLOW=$(tput setaf 136);
+  ORANGE=$(tput setaf 166);
+  GREEN=$(tput setaf 64);
+  BLUE=$(tput setaf 33);
+
+  export PS1='\[$ORANGE\]\u\[$RESET\] @ \[$YELLOW\]\h\[$RESET\] in \[$GREEN\]\w\[$RESET\]\n$(prompt_char) '
+elif [[ $THEME == "gruvbox" ]]; then
+  YELLOW=$(tput setaf 172);
+  ORANGE=$(tput setaf 166);
+  GREEN=$(tput setaf 106);
+  BLUE=$(tput setaf 66);
+
+  export PS1='\[$ORANGE\]\u\[$RESET\] @ \[$YELLOW\]\h\[$RESET\] in \[$GREEN\]\w\[$RESET\]\n$(prompt_char) '
+fi
 
 ##################################################
 #
@@ -54,6 +72,9 @@ export PS1='\[$ORANGE\]\u\[$RESET\] @ \[$YELLOW\]\h\[$RESET\] in \[$GREEN\]\w\[$
 #
 ##################################################
 
+export PYTHON_ENV_PATH=$HOME/env
+export PIP_REQUIRE_VIRTUALENV=true
+
 function activate () {
     command source $PYTHON_ENV_PATH/$1/bin/activate
 }
@@ -74,30 +95,6 @@ function _envdir () {
 }
 complete -F _envdir activate
 
-# Setting PATH for Python 3.6
-PATH="/Library/Frameworks/Python.framework/Versions/3.6/bin:${PATH}"
-export PATH
-
-##################################################
-#
-#   Ruby Stuffs
-#
-##################################################
-
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*
-
-##################################################
-#
-#   Scala/Play Stuffs
-#
-##################################################
-
-export SCALA_HOME=/usr/local/bin/scala
-export PLAY_PATH="/usr/local/play"
-export PATH=$PATH:$PLAY_PATH
-
-export SBT_CREDENTIALS=$HOME/.ivy2/.credentials
-
 ##################################################
 #
 #   Go Stuffs
@@ -105,6 +102,7 @@ export SBT_CREDENTIALS=$HOME/.ivy2/.credentials
 ##################################################
 
 export GOPATH=$HOME/Projects/go
+export PATH=/opt/go/bin:$PATH
 export PATH=$PATH:$(go env GOPATH)/bin
 
 ##################################################
@@ -113,7 +111,6 @@ export PATH=$PATH:$(go env GOPATH)/bin
 #
 ##################################################
 
-export PATH="$HOME/.cargo/bin:$PATH"
 
 ##################################################
 #
@@ -155,11 +152,11 @@ complete -F _ssh_hosts ssh
 
 ##################################################
 #
-#   Aliases
+#   Aliases, etc.
 #
 ##################################################
 
 alias grep="grep --color=auto"
-[[ -s "$HOME/.profile" ]] && source "$HOME/.profile"
-
-export BASH_SILENCE_DEPRECATION_WARNING=1
+export EDITOR=/usr/bin/vi
+export PATH=~/bin:/opt/bin:~/bin/app-images:$PATH
+. "$HOME/.cargo/env"

diff --git a/dotvim/bundle/ale b/dotvim/bundle/ale
index 3115d2025a3a9ae1492a8d85e01497a8ddd8c60a..da1e4dcd1e5ebf340b1edbedb18dc2ba139e6e40 160000 (submodule)
--- a/dotvim/bundle/ale
+++ b/dotvim/bundle/ale
@@ -1 +1 @@
-Subproject commit 3115d2025a3a9ae1492a8d85e01497a8ddd8c60a
+Subproject commit da1e4dcd1e5ebf340b1edbedb18dc2ba139e6e40

diff --git a/dotvim/bundle/ctrlp.vim b/dotvim/bundle/ctrlp.vim
index 88abbcb926a415b789ff648cbdc86ed4b353bfc1..ed04d2ec91c78748f0d8ddf69df2f6e5cffa7bb8 160000 (submodule)
--- a/dotvim/bundle/ctrlp.vim
+++ b/dotvim/bundle/ctrlp.vim
@@ -1 +1 @@
-Subproject commit 88abbcb926a415b789ff648cbdc86ed4b353bfc1
+Subproject commit ed04d2ec91c78748f0d8ddf69df2f6e5cffa7bb8

diff --git a/dotvim/bundle/gruvbox b/dotvim/bundle/gruvbox
new file mode 160000 (submodule)
index 0000000..bf2885a
--- /dev/null
+++ b/dotvim/bundle/gruvbox
@@ -0,0 +1 @@
+Subproject commit bf2885a95efdad7bd5e4794dd0213917770d79b7

diff --git a/dotvim/bundle/nerdtree b/dotvim/bundle/nerdtree
index eee431dbd44111c858c6d33ffd366cae1f17f8b3..eed488b1cd1867bd25f19f90e10440c5cc7d6424 160000 (submodule)
--- a/dotvim/bundle/nerdtree
+++ b/dotvim/bundle/nerdtree
@@ -1 +1 @@
-Subproject commit eee431dbd44111c858c6d33ffd366cae1f17f8b3
+Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424

diff --git a/dotvim/bundle/typescript-vim b/dotvim/bundle/typescript-vim
index 7e25a901af7cd993498cc9ecfc833ca2ac21db7a..67e81e4292186889a1a519e1bf3a600d671237eb 160000 (submodule)
--- a/dotvim/bundle/typescript-vim
+++ b/dotvim/bundle/typescript-vim
@@ -1 +1 @@
-Subproject commit 7e25a901af7cd993498cc9ecfc833ca2ac21db7a
+Subproject commit 67e81e4292186889a1a519e1bf3a600d671237eb

diff --git a/dotvim/bundle/vim-flake8 b/dotvim/bundle/vim-flake8
index 91818a7d5f5a0af5139e9adfedc9d00fa963e699..5bd58732be452a32e923179673b94e5f1ed5dc9e 160000 (submodule)
--- a/dotvim/bundle/vim-flake8
+++ b/dotvim/bundle/vim-flake8
@@ -1 +1 @@
-Subproject commit 91818a7d5f5a0af5139e9adfedc9d00fa963e699
+Subproject commit 5bd58732be452a32e923179673b94e5f1ed5dc9e

diff --git a/dotvim/bundle/vim-fugitive b/dotvim/bundle/vim-fugitive
index b754bc2031f21a532c083dd0d072ba373bbe3a37..59529a2c3634dc1cb3956c4faaf824f5c4dd7be1 160000 (submodule)
--- a/dotvim/bundle/vim-fugitive
+++ b/dotvim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit b754bc2031f21a532c083dd0d072ba373bbe3a37
+Subproject commit 59529a2c3634dc1cb3956c4faaf824f5c4dd7be1

diff --git a/dotvim/bundle/vim-go b/dotvim/bundle/vim-go
index bcf3f23dd76f39f3c3b840e3f95772ab46312219..430bc227654abc3eb5e27a9052a857344ca08cdc 160000 (submodule)
--- a/dotvim/bundle/vim-go
+++ b/dotvim/bundle/vim-go
@@ -1 +1 @@
-Subproject commit bcf3f23dd76f39f3c3b840e3f95772ab46312219
+Subproject commit 430bc227654abc3eb5e27a9052a857344ca08cdc

diff --git a/dotvim/bundle/vim-javascript b/dotvim/bundle/vim-javascript
index 4c0a554423df72ecb8d13b143afa7a4cfcb994ec..d6e137563c47fb59f26ed25d044c0c7532304f18 160000 (submodule)
--- a/dotvim/bundle/vim-javascript
+++ b/dotvim/bundle/vim-javascript
@@ -1 +1 @@
-Subproject commit 4c0a554423df72ecb8d13b143afa7a4cfcb994ec
+Subproject commit d6e137563c47fb59f26ed25d044c0c7532304f18

diff --git a/dotvimrc b/dotvimrc
index d888cf6b79ff046708449ef575952a0d28487bd4..7e46970db24be5c586a14aacee2d990d98fb5b15 100644 (file)
--- a/dotvimrc
+++ b/dotvimrc
@@ -7,7 +7,11 @@ syntax enable
 let g:solarized_termcolors=256
 let g:solarized_termtrans=1
 set background=dark
-colorscheme solarized
+
+let g:gruvbox_italic=1
+let g:gruvbox_contrast_dark="hard"
+
+colorscheme gruvbox
 
 if has('gui_running')
     set colorcolumn=80

diff --git a/update_modules.sh b/update_modules.sh
new file mode 100755 (executable)
index 0000000..cf61c32
--- /dev/null
+++ b/update_modules.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+
+MODDIRS=$(git submodule status | cut -d ' ' -f 3)
+for d in $MODDIRS; do
+  (
+    echo "updating submodule @ $d"
+    cd $d
+    git checkout master && git pull origin master
+  )
+done