From a62da7a91d7c4cd71e535eba09c925d2b2aa48f4 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Thu, 8 Jun 2023 12:43:32 -0500
Subject: [PATCH] various

---
 config/.config/nvim/lazy-lock.json         |  93 +++++++++++++++++++++
 config/.config/nvim/spell/en.utf-8.add     |   1 +
 config/.config/nvim/spell/en.utf-8.add.spl | Bin 144 -> 226 bytes
 vim/.vim/lua/config/lsp.lua                |  16 ++--
 vim/.vim/lua/config/nvim-treesitter.lua    |   2 +-
 vim/.vim/lua/config/trouble.lua            |   2 +-
 vim/.vim/prefs/leader.vim                  |   2 +-
 zsh/.bash_profile.google                   |   7 +-
 zsh/.zshrc                                 |   1 +
 9 files changed, 111 insertions(+), 13 deletions(-)
 create mode 100644 config/.config/nvim/lazy-lock.json

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
new file mode 100644
index 0000000..3cc2c87
--- /dev/null
+++ b/config/.config/nvim/lazy-lock.json
@@ -0,0 +1,93 @@
+{
+  "asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" },
+  "auto-session": { "branch": "main", "commit": "21033c6815f249a7839c3a85fc8a6b44d74925c9" },
+  "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" },
+  "catppuccin": { "branch": "main", "commit": "57b421ee5f7380f816791fa451e86f213b625ece" },
+  "ciderlsp-nvim": { "branch": "main", "commit": "7007e1881eb421a4d6f7ef1f31e973f7cc0b4d8d" },
+  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" },
+  "cmp-nvim-ciderlsp": { "branch": "main", "commit": "e1b0015a0c090e20d1cbb34e5639e6dd145d3f3e" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
+  "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
+  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
+  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+  "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" },
+  "cmp-tabnine": { "branch": "main", "commit": "b93f82ef5150e578677fc2e2b4b328b19eed77e1" },
+  "cmp-treesitter": { "branch": "master", "commit": "389eadd48c27aa6dc0e6b992644704f026802a2e" },
+  "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
+  "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
+  "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
+  "factorus": { "branch": "master", "commit": "19816e370df82fe96ca96856cf2be4d1c82302da" },
+  "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
+  "fzf": { "branch": "master", "commit": "94999101e358385f3ca67a6ec9512f549196b802" },
+  "fzf.vim": { "branch": "master", "commit": "dc71692255b62d1f67dc55c8e51ab1aa467b1d46" },
+  "git-conflict.nvim": { "branch": "main", "commit": "e83d9cc866338ed75b886d5a98c9ff03da99434d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "814158f6c4b1724c039fcefe79b0be72c9131c2d" },
+  "go.nvim": { "branch": "master", "commit": "b119217e8324f13a2be12935f5d2d15a1df09b09" },
+  "google-comments": { "branch": "main", "commit": "ad50cd3c71a7553c92a966dba6a03232a81e3812" },
+  "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" },
+  "hg.nvim": { "branch": "main", "commit": "f9bab452d778f74976430f091a8830ec2d8a3720" },
+  "impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" },
+  "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
+  "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
+  "lazy.nvim": { "branch": "main", "commit": "652b6febf8d5c99eb8cf4a1cec63da6db62e77d2" },
+  "libp.nvim": { "branch": "main", "commit": "db62a17ad68946d970bca0b0736e854058d3b307" },
+  "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
+  "lsp-zero.nvim": { "branch": "v2.x", "commit": "7c7977cbcff64f8b057bcba0d15ea17e75bf90d2" },
+  "lsp_lines.nvim": { "branch": "main", "commit": "3b57922d2d79762e6baedaf9d66d8ba71f822816" },
+  "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
+  "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "90a8bbf106b85b76951a34c542058ffa807de2b1" },
+  "mason.nvim": { "branch": "main", "commit": "a51391311e86c295fc7611be2beb58859e93f21b" },
+  "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
+  "neo-tree.nvim": { "branch": "v2.x", "commit": "541f5c92d2492041afb354e2df6e74809094b051" },
+  "neoconf.nvim": { "branch": "main", "commit": "6086792a14a4490b227075a847f4226c07ed7eac" },
+  "neodev.nvim": { "branch": "main", "commit": "6498a07601702349c31909005bb333003e4687d4" },
+  "nerdcommenter": { "branch": "master", "commit": "277bdfc6796479639b4c580d2089e2a34962cd1f" },
+  "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" },
+  "null-ls.nvim": { "branch": "main", "commit": "08bb00c7c2cd58c72e02cf54e4b9cbfe14b03e09" },
+  "nvim-cmp": { "branch": "main", "commit": "935b4069ce73b60ba9075bf05ee6ab50ed3af1a9" },
+  "nvim-figtree": { "branch": "main", "commit": "ea52b470a47114abfeec903306c55d8322298e00" },
+  "nvim-lightbulb": { "branch": "master", "commit": "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7" },
+  "nvim-lspconfig": { "branch": "master", "commit": "84717430fb6f51c9e9cc8d63da10cceafc91500c" },
+  "nvim-notify": { "branch": "master", "commit": "159c6cf1be25a933f35e97499314c9faab55c98f" },
+  "nvim-osc52": { "branch": "main", "commit": "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31" },
+  "nvim-scrollbar": { "branch": "main", "commit": "f3a5469e9881360e70d34b25333c910ee4a505f3" },
+  "nvim-treesitter": { "branch": "master", "commit": "73c7af9cdbce9330eeb9771639c86269f6d7cf9d" },
+  "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" },
+  "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
+  "refactoring.nvim": { "branch": "master", "commit": "47a1716a9020c0093a1c8af36c3f9434dae62bbd" },
+  "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
+  "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
+  "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
+  "telekasten.nvim": { "branch": "main", "commit": "617469cd0690c84264f7d472cf1fe860ccfc0832" },
+  "telescope-citc.nvim": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
+  "telescope-codesearch.nvim": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
+  "telescope-fig.nvim": { "branch": "main", "commit": "90150e1aa368b49a5125689b3a6da573a99e2bda" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "4054a5d0ab85475bf75df00cf10754d2e54b5532" },
+  "telescope.nvim": { "branch": "master", "commit": "d77b37f4520e5fc2cf4c74c12e42ed4b589bd367" },
+  "trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" },
+  "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" },
+  "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
+  "vim-better-whitespace": { "branch": "master", "commit": "1b22dc57a2751c7afbc6025a7da39b7c22db635d" },
+  "vim-dirdiff": { "branch": "master", "commit": "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9" },
+  "vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" },
+  "vim-matchup": { "branch": "master", "commit": "6c8909b682803d8c3a054259079f158a73a0e30f" },
+  "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },
+  "vim-searchindex": { "branch": "master", "commit": "b0788c8213210b3bd23b62847dd5a9ebbe4ad648" },
+  "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" },
+  "vim-startuptime": { "branch": "master", "commit": "01b67169c3ebe41f163c07bf6853555ca19bc27f" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
+  "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
+  "vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" },
+  "vim-tmux-syntax": { "branch": "master", "commit": "1b6a6a5beb96fa232c8d35d305f77496b12678a9" },
+  "vim-tmux-yank": { "branch": "master", "commit": "8432fd440f61ddead070093be06b3dd6b0b5790e" },
+  "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" },
+  "vim-windowswap": { "branch": "master", "commit": "15db3f697aa1fa696d99fcdc920c90cd2cec855e" },
+  "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" },
+  "which-key.nvim": { "branch": "main", "commit": "015fdf3e3e052d4a9fee997ca0aa387c2dd3731c" }
+}
\ No newline at end of file
diff --git a/config/.config/nvim/spell/en.utf-8.add b/config/.config/nvim/spell/en.utf-8.add
index 0271052..41de73f 100644
--- a/config/.config/nvim/spell/en.utf-8.add
+++ b/config/.config/nvim/spell/en.utf-8.add
@@ -2,3 +2,4 @@ private
 handlePackageIntent
 for/!
 tooling/!
+createApkDescriptor
diff --git a/config/.config/nvim/spell/en.utf-8.add.spl b/config/.config/nvim/spell/en.utf-8.add.spl
index b76166884971ede265062e0b0749163f077147a5..8b9bf8a4cbcbabce5a3296a29b125ab37e3b2af0 100644
GIT binary patch
literal 226
zcmZvVu?oUK5JYDJ_Wp%nCH{e6lOmAHKAbT*awLm6Qs>WgPAx8Avo|+8JMUIjv$Y|d
zUjS_99=%0A*|K5$Oyj`2)J!Me)8tQ5#rl2rN{&hdWlY*B->}oq%TFC62^>?a=kn`?
ijwjuujJBsv^r~=uhQ6q7;Pnq08M59W%N%)#Dh1xF6fC3w

delta 56
zcmaFFIDt_(%+t5HAT=k)=syDkgEvcBMnTC$Yb}-%My7^|Suz})=|Eu(#*B$ul{rcn
IfovcE0Mg+Ny#N3J

diff --git a/vim/.vim/lua/config/lsp.lua b/vim/.vim/lua/config/lsp.lua
index 9b7233d..46e89eb 100644
--- a/vim/.vim/lua/config/lsp.lua
+++ b/vim/.vim/lua/config/lsp.lua
@@ -19,10 +19,10 @@ if use_google() then
         default_config = {
             cmd = { "/google/bin/releases/cider/ciderlsp/ciderlsp", "--tooltag=nvim-cmp", "--forward_sync_responses", "--merge_diagnostic_layers" },
             filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "typescript"},
-            -- root_dir = lspconfig.util.root_pattern("BUILD"),
-            root_dir = function(fname)
-                return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
-            end;
+            root_dir = lspconfig.util.root_pattern("BUILD"),
+            -- root_dir = function(fname)
+            --     return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
+            -- end;
             settings = {},
         },
     }
@@ -31,10 +31,10 @@ if use_google() then
         default_config = {
             cmd = { '/google/bin/users/lerm/glint-ale/analysis_lsp/server', '--lint_on_save=false', '--max_qps=10' },
             filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "markdown","typescript", "javascript"},
-            -- root_dir = lspconfig.util.root_pattern('BUILD'),
-            root_dir = function(fname)
-                return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
-            end;
+            root_dir = lspconfig.util.root_pattern('BUILD'),
+            -- root_dir = function(fname)
+            --     return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
+            -- end;
             settings = {},
         },
     }
diff --git a/vim/.vim/lua/config/nvim-treesitter.lua b/vim/.vim/lua/config/nvim-treesitter.lua
index 37e86cb..c3cc774 100644
--- a/vim/.vim/lua/config/nvim-treesitter.lua
+++ b/vim/.vim/lua/config/nvim-treesitter.lua
@@ -12,7 +12,7 @@ sync_install = false,
         indent = {
             enable = true
         },
-        disable = {"java"},
+        -- disable = {"java"},
         --
         -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
         -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
diff --git a/vim/.vim/lua/config/trouble.lua b/vim/.vim/lua/config/trouble.lua
index 54d37e1..9e5b185 100644
--- a/vim/.vim/lua/config/trouble.lua
+++ b/vim/.vim/lua/config/trouble.lua
@@ -35,4 +35,4 @@ vim.api.nvim_set_keymap("n", "<Leader>xq", "<Cmd>Trouble quickfix<CR>", opts)
 vim.api.nvim_set_keymap("n", "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opts)
 vim.api.nvim_set_keymap("n", "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>", opts)
 
-vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]
+-- vim.cmd [[autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]
diff --git a/vim/.vim/prefs/leader.vim b/vim/.vim/prefs/leader.vim
index 07e0084..b2ac76f 100644
--- a/vim/.vim/prefs/leader.vim
+++ b/vim/.vim/prefs/leader.vim
@@ -122,7 +122,7 @@ function! <SID>SynStack()
   echo map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
 endfunc
 
-nnoremap <leader>s :SaveSession<CR>
+nnoremap <leader>s :SessionSave<CR>
 
 " copy to attached terminal using the yank(1) script:
 " https://github.com/sunaku/home/blob/master/bin/yank
diff --git a/zsh/.bash_profile.google b/zsh/.bash_profile.google
index c86fcd9..72e43be 100644
--- a/zsh/.bash_profile.google
+++ b/zsh/.bash_profile.google
@@ -70,6 +70,8 @@ alias hgd='source /google/src/head/depot/google3/experimental/fig_contrib/hgshor
 alias builddoctor=/google/bin/releases/build-doctor/builddoctor
 alias rudi=/google/data/ro/teams/lsc/bin/rudi-cli
 alias rudi-cli=/google/data/ro/teams/lsc/bin/rudi-cli
+alias tmux=tmx2
+compdef tmx2=tmux
 
 export ACID_STARTUP_SCRIPT_PATH=~/acid_startup.sh
 export PATH=$PATH:/usr/local/google/home/cnieves/.local/binexport PATH=$PATH:/usr/local/google/home/cnieves/.local/bin
@@ -180,8 +182,9 @@ to_mac(){
 }
 
 bdoctor() {
-    default=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http)
-    hourly=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --analysis_name=hourly --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http)
+    default=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http | sed 's/Created Analysis TaskSet (results will appear here): //')
+    hourly=$(builddoctor analyze --blueprint //depot/google3/java/com/google/android/gmscore/tools/build_doctor/build_doctor.blueprint --cl $1 --analysis_type=PERIODIC --analysis_name=hourly --buildable_unit_type BUILD --buildable_unit gmscore.build_doctor.debug_container | grep http | sed 's/Created Analysis TaskSet (results will appear here): //')
+
     echo "DEFAULT(ANALYSIS): $default"
     echo "HOURLY(EXECUTION): $hourly"
 }
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 962a3d6..f4bfcc8 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -266,3 +266,4 @@ source ~/.bash_profile
 
 alias luamake=/luamake
 export PATH="/opt/homebrew/opt/openjdk/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"