From 9b0360a291ff13a4fc8383ad10b30cb7679052a5 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Mon, 8 Jul 2024 18:48:13 +0000
Subject: [PATCH] bleh

---
 config/.config/nvim/lazy-lock.json   |  2 +-
 tmux/.tmux/plugins/tmux-continuum    |  2 +-
 vim/.vim/lua/config/lsp-google.lua   | 34 +---------------------------
 vim/.vim/lua/plugins/diagnostics.lua |  2 +-
 vim/.vim/lua/plugins/lsp.lua         |  5 ++--
 5 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 95c5e65..eb8b52d 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "44cd12fa2709a4de644b1d7c2773d5c59df07a66" }
+  "lazy.nvim": { "branch": "main", "commit": "cea5920abb202753004440f94ec39bcf2927e02e" }
 }
\ No newline at end of file
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 dc90f51..695abb5 100644
--- a/vim/.vim/lua/config/lsp-google.lua
+++ b/vim/.vim/lua/config/lsp-google.lua
@@ -32,35 +32,6 @@ function M.setup(capabilities)
 			},
 		}
 
-		-- configs.analysislsp = {
-		-- 	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 = function(fname)
-		-- 			return string.match(fname, "(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$")
-		-- 		end,
-		-- 		settings = {},
-		-- 	},
-		-- }
-
 		local my_on_attach = function(client, bufnr)
 			require("lualine").refresh()
 			vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
@@ -96,13 +67,10 @@ function M.setup(capabilities)
 		end
 
 		lspconfig.ciderlsp.setup({
-			gapabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
+			capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
 			on_attach = cider_on_attach,
 			handlers = cider_lsp_handlers,
 		})
-		-- lspconfig.analysislsp.setup({
-		-- 	capabilities = capabilities,
-		-- })
 	end
 end
 
diff --git a/vim/.vim/lua/plugins/diagnostics.lua b/vim/.vim/lua/plugins/diagnostics.lua
index c43b082..8da041c 100644
--- a/vim/.vim/lua/plugins/diagnostics.lua
+++ b/vim/.vim/lua/plugins/diagnostics.lua
@@ -64,7 +64,7 @@ return {
 					else
 						vim.diagnostic.config({
 							virtual_improved = {
-								severity = { min = vim.diagnostic.severity.HINT },
+								severity = { min = vim.diagnostic.severity.WARN },
 								current_line = "hide",
 							},
 						})
diff --git a/vim/.vim/lua/plugins/lsp.lua b/vim/.vim/lua/plugins/lsp.lua
index 5269282..46d367e 100644
--- a/vim/.vim/lua/plugins/lsp.lua
+++ b/vim/.vim/lua/plugins/lsp.lua
@@ -63,13 +63,12 @@ return {
 			"neovim/nvim-lspconfig",
 			"nvim-treesitter/nvim-treesitter",
 		},
+		cond = not use_google(),
 		config = function()
 			local capabilities =
 				require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
 			capabilities.offsetEncoding = { "utf-16" }
-			require("go").setup({
-				capabilities = capabilities,
-			})
+			require("go").setup({ lsp_cfg = { capabilities = capabilities } })
 			-- Run gofmt + goimports on save
 
 			local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})