From a23d3e359a3db953bbbef34fd044e5100f0fe67b Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Thu, 3 Aug 2023 02:14:05 +0000
Subject: [PATCH] bump

---
 config/.config/nvim/lazy-lock.json | 2 ++
 vim/.vim/lua/plugins/formatter.lua | 6 ++++--
 zsh/.bash_profile.google           | 1 +
 zsh/.zshrc                         | 3 +++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 3b89b2d..3b379f8 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -23,6 +23,7 @@
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
+  "formatter.nvim": { "branch": "master", "commit": "9bf2e7e294b00bac87c6123c889828ee08dc9b46" },
   "friendly-snippets": { "branch": "main", "commit": "ea84a710262cb2c286d439070bad37d36fd3db25" },
   "fzf": { "branch": "master", "commit": "3c09c77269d848f5e7dd8f350a90e8d7ed760845" },
   "fzf.vim": { "branch": "master", "commit": "e0d131d95364edf940a70127fcb5748b86e6955e" },
@@ -52,6 +53,7 @@
   "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
   "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" },
   "nvim-lightbulb": { "branch": "master", "commit": "6166029a136afd56cf23384fc31e8ba203a6e102" },
+  "nvim-lint": { "branch": "master", "commit": "4744fc04c3a869c9eaa137fec13d992aea7da7ee" },
   "nvim-lspconfig": { "branch": "master", "commit": "447443a2404adc323ad2efc7c0a346a904ce694c" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
   "nvim-osc52": { "branch": "main", "commit": "3e96035d62290183fe7a11418db2b254fcfcaee3" },
diff --git a/vim/.vim/lua/plugins/formatter.lua b/vim/.vim/lua/plugins/formatter.lua
index 0573553..49a15ec 100644
--- a/vim/.vim/lua/plugins/formatter.lua
+++ b/vim/.vim/lua/plugins/formatter.lua
@@ -51,11 +51,13 @@ return {
 							args = {
 								"-quiet",
 								"-xml",
+								"--wrap yes",
 								"--indent yes",
 								"--indent-spaces 2",
+								"--indent-attributes yes",
 								"--sort-attributes alpha",
-								-- "--verical-space yes",
-								"--literal-attributes yes",
+								"--wrap-attributes yes",
+								"--vertical-space yes",
 								"--tidy-mark no",
 							},
 							stdin = true,
diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google
index 296cb57..f99cbbd 100644
--- a/zsh/.bash_profile.google
+++ b/zsh/.bash_profile.google
@@ -49,6 +49,7 @@ export FZF_CS_PREVIEW_HIGHLIGHT="\x1b[38;2;248;248;248m\x1b[48;2;81;85;89m"
 source ~/g3path.zsh
 source /etc/bash_completion.d/hgd
 
+source /google/bin/releases/gmscore-tools/cli/prod/setup_prod_gms.sh
 alias acid=/google/bin/releases/mobile-devx-platform/acid/acid
 alias apido='/google/data/ro/teams/oneplatform/apido'
 alias bugs=/google/data/rw/users/mk/mkannan/www/bin/bugs
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 866fed8..45600a9 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -271,3 +271,6 @@ export PATH="$HOME/.local/bin:$PATH"
 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
+
+# Setup go/hi #!>>HI<<!#
+source /etc/bash.bashrc.d/shell_history_forwarder.sh #!>>HI<<!#