bleh

config/.config/nvim/lazy-lock.json

@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "44cd12fa2709a4de644b1d7c2773d5c59df07a66" }
+  "lazy.nvim": { "branch": "main", "commit": "cea5920abb202753004440f94ec39bcf2927e02e" }
 }

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
 

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",
 							},
 						})

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({
+			require("go").setup({ lsp_cfg = { capabilities = capabilities } })
-				capabilities = capabilities,
-			})
 			-- Run gofmt + goimports on save
 
 			local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})