From 7744a799f0542e998f94f9a7fb61201a1d78b87b Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Fri, 4 Oct 2024 18:21:31 +0000
Subject: [PATCH] blep

---
 config/.config/nvim/lazy-lock.json   |  2 +-
 tmux/.tmux/plugins/tmux-continuum    |  2 +-
 vim/.vim/lua/config/lsp-google.lua   |  2 +-
 vim/.vim/lua/plugins/google.lua      | 76 ++++++++++++++++++++++++++++
 vim/.vim/lua/plugins/themes-work.lua |  2 +-
 5 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 358f6c7..631f865 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" }
+  "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }
 }
diff --git a/tmux/.tmux/plugins/tmux-continuum b/tmux/.tmux/plugins/tmux-continuum
index 3e4bc35..0698e8f 160000
--- a/tmux/.tmux/plugins/tmux-continuum
+++ b/tmux/.tmux/plugins/tmux-continuum
@@ -1 +1 @@
-Subproject commit 3e4bc35da41f956c873aea716c97555bf1afce5d
+Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0
diff --git a/vim/.vim/lua/config/lsp-google.lua b/vim/.vim/lua/config/lsp-google.lua
index a301464..c0b6850 100644
--- a/vim/.vim/lua/config/lsp-google.lua
+++ b/vim/.vim/lua/config/lsp-google.lua
@@ -27,7 +27,7 @@ function M.setup(capabilities)
 					"bzl",
 					"typescript",
 				},
-				root_dir = lspconfig.util.root_pattern("google3/*BUILD"),
+				root_dir = require("lspconfig").util.root_pattern(".citc"),
 				settings = {},
 			},
 		}
diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua
index 1e248b1..a00228e 100644
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@@ -342,4 +342,80 @@ return {
 			require("hg").setup()
 		end,
 	},
+	{
+		{
+			"sakal/neoblaze.nvim",
+			url = "sso://user/sakal/neoblaze.nvim",
+			lazy = false, -- Can be disabled if you only use keybinds.
+			keys = {
+				{
+					"<leader>B",
+					desc = "Blaze",
+				},
+				{
+					"<leader>Bb",
+					function()
+						require("neoblaze").build()
+					end,
+					desc = "Build",
+				},
+				{
+					"<leader>Bt",
+					function()
+						require("neoblaze").test()
+					end,
+					desc = "Test",
+				},
+				{
+					"<leader>Br",
+					function()
+						require("neoblaze").run()
+					end,
+					desc = "Run",
+				},
+				{
+					"<leader>Bs",
+					function()
+						require("neoblaze").update_goldens()
+					end,
+					desc = "Update goldens",
+				},
+				{
+					"<leader>BB",
+					function()
+						require("neoblaze").build({ blaze_exe = "iblaze" })
+					end,
+					desc = "Build (iblaze)",
+				},
+				{
+					"<leader>BT",
+					function()
+						require("neoblaze").test({ blaze_exe = "iblaze" })
+					end,
+					desc = "Test (iblaze)",
+				},
+				{
+					"<leader>BR",
+					function()
+						require("neoblaze").run({ blaze_exe = "iblaze" })
+					end,
+					desc = "Run (iblaze)",
+				},
+				{
+					"<leader>Be",
+					function()
+						require("neoblaze").retry()
+					end,
+					desc = "Retry",
+				},
+				{
+					"<leader>By",
+					function()
+						require("neoblaze").yank()
+					end,
+					desc = "Yank target to system clipboard",
+				},
+			},
+		},
+	},
 }
diff --git a/vim/.vim/lua/plugins/themes-work.lua b/vim/.vim/lua/plugins/themes-work.lua
index e54ae8c..9876925 100644
--- a/vim/.vim/lua/plugins/themes-work.lua
+++ b/vim/.vim/lua/plugins/themes-work.lua
@@ -42,7 +42,7 @@ return {
 		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
 		cond = use_google(),
 		config = function()
-			vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha
+			vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
 			local colors = require("catppuccin.palettes").get_palette()
 
 			require("catppuccin").setup({