From e00277beb063c822f184e6a466861af1f382f0ad Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Mon, 8 Aug 2022 11:10:54 -0500
Subject: [PATCH] Update Google prefs loading

---
 vim/.vim/plugged/fzf.vim                          | 2 +-
 vim/.vim/plugged/nvim-lspconfig                   | 2 +-
 vim/.vim/plugged/nvim-treesitter                  | 2 +-
 vim/.vim/plugged/onehalf                          | 2 +-
 vim/.vim/plugged/plenary.nvim                     | 2 +-
 vim/.vim/plugged/purify                           | 2 +-
 vim/.vim/plugged/telescope.nvim                   | 2 +-
 vim/.vim/plugged/vim-airline                      | 2 +-
 vim/.vim/plugged/vim-fugitive                     | 2 +-
 vim/.vim/plugged/vim-go                           | 2 +-
 vim/.vim/plugged/vim-javascript                   | 2 +-
 vim/.vim/plugged/vim-titlecase                    | 2 +-
 vim/.vimrc                                        | 4 ++--
 zsh/.bash_profile                                 | 5 ++++-
 zsh/{.bash_profile.local => .bash_profile.google} | 0
 15 files changed, 18 insertions(+), 15 deletions(-)
 rename zsh/{.bash_profile.local => .bash_profile.google} (100%)

diff --git a/vim/.vim/plugged/fzf.vim b/vim/.vim/plugged/fzf.vim
index c311c0a..c6b59d8 160000
--- a/vim/.vim/plugged/fzf.vim
+++ b/vim/.vim/plugged/fzf.vim
@@ -1 +1 @@
-Subproject commit c311c0a95fc2529c26ab36a8f530e9dd4426304c
+Subproject commit c6b59d8ad7178b5873b3d71de9ff21652f05ec3c
diff --git a/vim/.vim/plugged/nvim-lspconfig b/vim/.vim/plugged/nvim-lspconfig
index ba25b74..a78831f 160000
--- a/vim/.vim/plugged/nvim-lspconfig
+++ b/vim/.vim/plugged/nvim-lspconfig
@@ -1 +1 @@
-Subproject commit ba25b747a3cff70c1532c2f28fcc912cf7b938ea
+Subproject commit a78831f97564b4344953ce1ba0f53fc5d034472d
diff --git a/vim/.vim/plugged/nvim-treesitter b/vim/.vim/plugged/nvim-treesitter
index 42891dc..7e41005 160000
--- a/vim/.vim/plugged/nvim-treesitter
+++ b/vim/.vim/plugged/nvim-treesitter
@@ -1 +1 @@
-Subproject commit 42891dccf82438ed021cd4ad338ff2412fb31dfd
+Subproject commit 7e410054235ea84c817fc2b93f8df359ba6545eb
diff --git a/vim/.vim/plugged/onehalf b/vim/.vim/plugged/onehalf
index 141c775..75eb2e9 160000
--- a/vim/.vim/plugged/onehalf
+++ b/vim/.vim/plugged/onehalf
@@ -1 +1 @@
-Subproject commit 141c775ace6b71992305f144a8ab68e9a8ca4a25
+Subproject commit 75eb2e97acd74660779fed8380989ee7891eec56
diff --git a/vim/.vim/plugged/plenary.nvim b/vim/.vim/plugged/plenary.nvim
index 986ad71..31807ee 160000
--- a/vim/.vim/plugged/plenary.nvim
+++ b/vim/.vim/plugged/plenary.nvim
@@ -1 +1 @@
-Subproject commit 986ad71ae930c7d96e812734540511b4ca838aa2
+Subproject commit 31807eef4ed574854b8a53ae40ea3292033a78ea
diff --git a/vim/.vim/plugged/purify b/vim/.vim/plugged/purify
index a6a5c60..70011cc 160000
--- a/vim/.vim/plugged/purify
+++ b/vim/.vim/plugged/purify
@@ -1 +1 @@
-Subproject commit a6a5c600dbb50beff82a20f2374f0bcd868b4414
+Subproject commit 70011ccc3225feb2e7bedda36d226adcf221f7ae
diff --git a/vim/.vim/plugged/telescope.nvim b/vim/.vim/plugged/telescope.nvim
index b5833a6..4725867 160000
--- a/vim/.vim/plugged/telescope.nvim
+++ b/vim/.vim/plugged/telescope.nvim
@@ -1 +1 @@
-Subproject commit b5833a682c511885887373aad76272ad70f7b3c2
+Subproject commit 4725867ec66b9a0f5e5ad95a1fd94c2f97fa2d2c
diff --git a/vim/.vim/plugged/vim-airline b/vim/.vim/plugged/vim-airline
index ebb89a0..66a6e03 160000
--- a/vim/.vim/plugged/vim-airline
+++ b/vim/.vim/plugged/vim-airline
@@ -1 +1 @@
-Subproject commit ebb89a0846ff8b8bc64579155d661b825f97d3f2
+Subproject commit 66a6e03a341885d67141d60a29d29e944d97a04f
diff --git a/vim/.vim/plugged/vim-fugitive b/vim/.vim/plugged/vim-fugitive
index 9a13fc8..66a921b 160000
--- a/vim/.vim/plugged/vim-fugitive
+++ b/vim/.vim/plugged/vim-fugitive
@@ -1 +1 @@
-Subproject commit 9a13fc87c4ab83ea81e71ccad9b846a5eb31a998
+Subproject commit 66a921bbe38bea19f6b581c8a56d5a8a41209e35
diff --git a/vim/.vim/plugged/vim-go b/vim/.vim/plugged/vim-go
index 7ec0a19..b524371 160000
--- a/vim/.vim/plugged/vim-go
+++ b/vim/.vim/plugged/vim-go
@@ -1 +1 @@
-Subproject commit 7ec0a19a78a453686cb5c9776e506375562f9a1f
+Subproject commit b524371788bcdd87215c6e59ca4b2853553077a4
diff --git a/vim/.vim/plugged/vim-javascript b/vim/.vim/plugged/vim-javascript
index d6e1375..67a3435 160000
--- a/vim/.vim/plugged/vim-javascript
+++ b/vim/.vim/plugged/vim-javascript
@@ -1 +1 @@
-Subproject commit d6e137563c47fb59f26ed25d044c0c7532304f18
+Subproject commit 67a3435bf670018ea0b561e018f28c966812cdf0
diff --git a/vim/.vim/plugged/vim-titlecase b/vim/.vim/plugged/vim-titlecase
index 630089d..69a697c 160000
--- a/vim/.vim/plugged/vim-titlecase
+++ b/vim/.vim/plugged/vim-titlecase
@@ -1 +1 @@
-Subproject commit 630089d75ab7f0597ab6b3b4c4c3e2e011a05e64
+Subproject commit 69a697c54a08ca5603cb757b4d4f78cd4b567549
diff --git a/vim/.vimrc b/vim/.vimrc
index f6a7588..dcb5950 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -83,7 +83,7 @@ call plug#begin('~/.vim/plugged')
   if filereadable(expand("~/.vimrc.local"))
       source ~/.vimrc.local
   endif
-  if filereadable(expand("~/.vim/prefs/use_google.vim"))
+  if filereadable(expand("~/use_google"))
       source ~/.vim/prefs/google.vim
   endif
 
@@ -112,7 +112,7 @@ lua << EOF
 
 EOF
 source ~/.vim/prefs/cmp.vim
-if filereadable(expand("~/.vim/prefs/use_google.vim"))
+if filereadable(expand("~/use_google"))
     source ~/.vim/prefs/google_comments.vim
 endif
 
diff --git a/zsh/.bash_profile b/zsh/.bash_profile
index c3dc270..5385a38 100644
--- a/zsh/.bash_profile
+++ b/zsh/.bash_profile
@@ -20,5 +20,8 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
-source ~/.bash_profile.local
+
+if [[ -f "~/use_google" ]]; then
+    source ~/.bash_profile.google
+fi
 source ~/.aliases.sh
diff --git a/zsh/.bash_profile.local b/zsh/.bash_profile.google
similarity index 100%
rename from zsh/.bash_profile.local
rename to zsh/.bash_profile.google