personal laptop changes

vim/.vim/lua/plugins/lsp.lua

@@ -201,9 +201,11 @@ return {
 				capabilities = require("cmp_nvim_ciderlsp").update_capabilities(capabilities)
 				capabilities.workspace.codeLens = { refreshSupport = true }
 				capabilities.workspace.diagnostics = { refreshSupport = true }
+
 				lspconfig.analysislsp.setup({
 					capabilities = capabilities,
 				})
+
 				lspconfig.ciderlsp.setup({
 					capabilities = capabilities,
 					on_attach = cider_on_attach,

vim/.vim/lua/plugins/mason.lua

@@ -1,10 +1,41 @@
 return {
-	"williamboman/mason.nvim",
 	"williamboman/mason-lspconfig.nvim",
+	dependencies = {
+		"williamboman/mason.nvim",
+	},
 	config = function()
+		local TableConcat = require("utils").TableConcat
+		local use_google = require("utils").use_google
+
+		local lsps = {
+			"lua_ls",
+			"rust_analyzer",
+		}
+
+		if not use_google then
+			TableConcat(lsps, {
+				"gopls",
+				"graphql",
+			})
+		end
+
 		require("mason").setup()
 		require("mason-lspconfig").setup({
-			ensure_installed = { "lua_ls", "rust_analyzer" },
+			ensure_installed = lsps,
+		})
+
+		require("mason-lspconfig").setup_handlers({
+			-- The first entry (without a key) will be the default handler
+			-- and will be called for each installed server that doesn't have
+			-- a dedicated handler.
+			function(server_name) -- default handler (optional)
+				require("lspconfig")[server_name].setup({})
+			end,
+			-- Next, you can provide a dedicated handler for specific servers.
+			-- For example, a handler override for the `rust_analyzer`:
+			["rust_analyzer"] = function()
+				require("rust-tools").setup({})
+			end,
 		})
 	end,
 }

vim/.vim/lua/plugins/null-ls.lua

@@ -3,6 +3,8 @@ return {
 	event = "VimEnter",
 	config = function()
 		local null_ls = require("null-ls")
+		local use_google = require("utils").use_google
+		local TableConcat = require("utils").TableConcat
 
 		local sources = {
 			-- Catch insensitive, inconsiderate writing.
@@ -12,7 +14,7 @@ return {
 			null_ls.builtins.diagnostics.buildifier,
 
 			-- Codespell finds common misspellings in text files.
-			-- null_ls.builtins.diagnostics.codespell,
+			null_ls.builtins.diagnostics.codespell,
 			-- null_ls.builtins.diagnostics.cspell, null_ls.builtins.code_actions.cspell,
 
 			-- An English prose linter. Can fix some issues via code actions.
@@ -22,6 +24,22 @@ return {
 			null_ls.builtins.formatting.google_java_format,
 		}
 
+		if not use_google then
+			TableConcat(sources, {
+				-- Bazel
+				null_ls.builtins.diagnostics.buildifier,
+				null_ls.builtins.formatting.buildifier,
+				-- Golang
+				null_ls.builtins.diagnostics.golangci_lint,
+				null_ls.builtins.formatting.gofmt,
+				null_ls.builtins.formatting.goimports_reviser,
+				-- Misc
+				null_ls.builtins.formatting.htmlbeautifier,
+				null_ls.builtins.formatting.jq,
+				null_ls.builtins.formatting.mdformat,
+			})
+		end
+
 		null_ls.setup({
 			sources = sources,
 		})

vim/.vim/lua/plugins/telescope.lua

@@ -1,11 +1,31 @@
+local use_google = require("utils").use_google
+local TableConcat = require("utils").TableConcat
+local keys = {
+	{ "<leader>fb", ":Telescope file_browser path=%:p:h select_buffer=true<CR>", desc = "[F]ile [B]rowser" },
+	{ "<leader>tb", ":Telescope file_buffers<CR>", desc = "[T]elescope [B]uffers" },
+	{ "<leader>th", [[:lua require('telescope.builtin').help_tags<cr>]], desc = "[T]elescope [H]elp" },
+	{ "<leader>t*", [[:lua require('telescope.builtin').grep_string<cr>]], desc = "[T]elescope current [W]ord" },
+	{ "<leader>tg", [[:lua require('telescope.builtin').live_grep<cr>]], desc = "[T]elescope by [G]rep" },
+}
+
+if use_google() then
+	TableConcat(keys, {
+		{ "<C-P>", [[:lua require('telescope').extensions.codesearch.find_files{}<CR>]], "n" },
+		{ "<C-Space>", [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]] },
+		{ "<leader>cs", [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]] },
+		{ "<leader>cs", [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]], mode = "v" },
+		{
+			"<leader>CS",
+			[[:lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
+		},
+	})
+end
+
 return {
-	"nvim-telescope/telescope-file-browser.nvim",
-	dependencies = {
-		"nvim-telescope/telescope.nvim",
-	},
-}, {
 	"nvim-telescope/telescope.nvim",
-	branch = "0.1.x",
+	dependencies = {
+		"nvim-telescope/telescope-file-browser.nvim",
+	},
 	config = function()
 		require("telescope").setup({
 			defaults = {
@@ -52,51 +72,5 @@ return {
 		})
 		require("telescope").load_extension("file_browser")
 	end,
-	keys = {
-		{
-			"<leader>fb",
-			":Telescope file_browser path=%:p:h select_buffer=true<CR>",
-			{ noremap = true },
-			desc = "[F]ile [B]rowser",
-		},
-		{
-			"<leader>tf",
-			":Telescope file_browser",
-			{ noremap = true },
-			desc = "[T]elescope [F]ilebrowser",
-		},
-		{ "<leader>tb", ":Telescope file_buffers", desc = "[T]elescope [B]uffers" },
-		{ "<leader>th", [[:lua require('telescope.builtin').help_tags<cr>]], desc = "[T]elescope [H]elp" },
-		{ "<leader>tw", [[:lua require('telescope.builtin').grep_string<cr>]], desc = "[T]elescope current [W]ord" },
-		{ "<leader>tg", [[:lua require('telescope.builtin').live_grep<cr>]], desc = "[T]elescope by [G]rep" },
-
-		-- Google mappings
-		{
-			"<C-P>",
-			[[:lua require('telescope').extensions.codesearch.find_files{}<CR>]],
-			"n",
-			{ noremap = true, silent = true },
-		},
-		{
-			"<C-Space>",
-			[[:lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-			{ noremap = true, silent = true },
-		},
-		{
-			"<leader>cs",
-			[[:lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-			{ noremap = true, silent = true },
-		},
-		{
-			"<leader>cs",
-			[[:lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-			mode = "v",
-			{ noremap = true, silent = true },
-		},
-		{
-			"<leader>CS",
-			[[:lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
-			{ noremap = true, silent = true },
-		},
-	},
+	keys = keys,
 }