lsp

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

@@ -1,15 +1,17 @@
 {
-  "aerial.nvim": { "branch": "master", "commit": "c663d1b55f002930187a09b9eeb5bd0bad0ea23c" },
+  "LuaSnip": { "branch": "master", "commit": "c7984d1cca3d8615e4daefc196597872a0b8d590" },
+  "aerial.nvim": { "branch": "master", "commit": "7c2a432238b9c8e8c526619fa003e658691ea127" },
   "ai.nvim": { "branch": "main", "commit": "d7391d4782b90ad3501f6f716f2b308092981787" },
   "asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" },
   "auto-session": { "branch": "main", "commit": "7afbb149f87be279778689596c781882014f7eef" },
   "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" },
-  "catppuccin": { "branch": "main", "commit": "506a4aa13443e0104ea49b99947cc09488d0791d" },
+  "catppuccin": { "branch": "main", "commit": "8d02781a638123394f9bc160aad47a9560a113f9" },
-  "ciderlsp_nvim": { "branch": "main", "commit": "7007e1881eb421a4d6f7ef1f31e973f7cc0b4d8d" },
+  "ciderlsp-nvim": { "branch": "main", "commit": "7007e1881eb421a4d6f7ef1f31e973f7cc0b4d8d" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-calc": { "branch": "main", "commit": "50792f34a628ea6eb31d2c90e8df174671e4e7a0" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
   "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-nvim-ciderlsp": { "branch": "main", "commit": "e1b0015a0c090e20d1cbb34e5639e6dd145d3f3e" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
@@ -19,11 +21,11 @@
   "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" },
+  "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "cmp_nvim_ciderlsp": { "branch": "main", "commit": "e1b0015a0c090e20d1cbb34e5639e6dd145d3f3e" },
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
   "formatter.nvim": { "branch": "master", "commit": "fa4f2729cc2909db599169f22d8e55632d4c8d59" },
+  "friendly-snippets": { "branch": "main", "commit": "5749f093759c29e3694053d048ceb940fe12c3d3" },
   "fzf": { "branch": "master", "commit": "01302d097c39c3429de65424c6adb75fcac82187" },
   "fzf.vim": { "branch": "master", "commit": "1dcdb21db618055134cd611f4f5918f6d00a5df0" },
   "git-conflict.nvim": { "branch": "main", "commit": "8d962d83cae924a314965f738ed1e05a4000d682" },
@@ -34,7 +36,7 @@
   "hg": { "branch": "main", "commit": "1c4bdf80174ec840ba76c4dc7032c4313db62199" },
   "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
-  "lazy.nvim": { "branch": "main", "commit": "b7043f2983d7aead78ca902f3f2053907081859a" },
+  "lazy.nvim": { "branch": "main", "commit": "4c8b625bc873ca76b76eee0c28c98f1f7148f17f" },
   "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
   "lsp-lens.nvim": { "branch": "main", "commit": "450736ecde76e4e127a7724ec8f6e260870863f8" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
@@ -42,34 +44,36 @@
   "lsp_lines.nvim": { "branch": "main", "commit": "f53af96d4789eef39a082dbcce078d2bfc384ece" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
+  "luasnip-google.nvim": { "branch": "main", "commit": "5fd7feb144de0ecea837618c9c9e1bbecc0e3243" },
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "d381fcb78d7a562c3244e1c8f76406954649db36" },
   "mason.nvim": { "branch": "main", "commit": "664c987c3b14d2262a4e580f993a3e5045baded0" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
-  "neo-tree.nvim": { "branch": "v2.x", "commit": "8324fd52f7880bf17142f56b45f544d64eff5ac9" },
+  "neo-tree.nvim": { "branch": "v2.x", "commit": "70d3daa22bf24de9e3e284ac659506b1374e3ae2" },
-  "nerdcommenter": { "branch": "master", "commit": "b0b09ea46c9f0509556257bd8b838b40f493d6a0" },
+  "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" },
   "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" },
   "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" },
+  "nvim-autopairs": { "branch": "master", "commit": "e8f7dd7a72de3e7b6626c050a802000e69d53ff0" },
   "nvim-cmp": { "branch": "main", "commit": "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0" },
   "nvim-lightbulb": { "branch": "master", "commit": "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7" },
   "nvim-lspconfig": { "branch": "master", "commit": "b6b34b9acf84949f0ac1c00747765e62b81fb38d" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
   "nvim-osc52": { "branch": "main", "commit": "3e96035d62290183fe7a11418db2b254fcfcaee3" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
-  "nvim-treesitter": { "branch": "master", "commit": "f26596386f31d5bd74b85b7d1ab0fd90c5b98608" },
+  "nvim-treesitter": { "branch": "master", "commit": "d49ba798c95398e62321b40041e8ac4654fea251" },
-  "nvim-web-devicons": { "branch": "master", "commit": "14b3a5ba63b82b60cde98d0a40319d80f25e8301" },
+  "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" },
   "nvim_figtree": { "branch": "main", "commit": "9bc3025f46e34732382da1019e256a9d8bec1e55" },
   "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" },
   "refactoring.nvim": { "branch": "master", "commit": "9f28801ed1803306ddbe5b8058849da412a90648" },
   "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
   "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
   "telekasten.nvim": { "branch": "main", "commit": "36dad2692974a5cc69813441442ccce8c53fbfd4" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "87dfaa9a9c251388cf4f01b9d4078c29d1fc8803" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "acf2eade45563803afdd4e9873a8481bc98bd726" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "776b509f80dd49d8205b9b0d94485568236d1192" },
   "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
   "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
   "telescope_fig": { "branch": "main", "commit": "90150e1aa368b49a5125689b3a6da573a99e2bda" },
-  "trouble.nvim": { "branch": "main", "commit": "a3372bd2ba3a91882a6e54ed35da13a441d7c167" },
+  "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" },
   "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" },
   "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
   "vim-better-whitespace": { "branch": "master", "commit": "1b22dc57a2751c7afbc6025a7da39b7c22db635d" },
@@ -86,7 +90,6 @@
   "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": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" }

vim/.vim/lua/plugins/base.lua

@@ -10,9 +10,16 @@ return {
 	"will133/vim-dirdiff",
 	"renerocksai/calendar-vim",
 	"google/vim-searchindex",
-	"hrsh7th/vim-vsnip",
 	"kosayoda/nvim-lightbulb",
 	"tpope/vim-surround",
+	{
+		"L3MON4D3/LuaSnip",
+		build = "make install_jsregexp",
+		config = function()
+			require("luasnip.loaders.from_vscode").lazy_load()
+		end,
+		dependencies = { "rafamadriz/friendly-snippets" },
+	},
 	"ntpeters/vim-better-whitespace",
 	"junegunn/fzf.vim",
 	"nathanaelkane/vim-indent-guides",

vim/.vim/lua/plugins/cmp.lua

@@ -1,4 +1,7 @@
 local use_google = require("utils").use_google
+local tprint = require("utils").tprint
+local dump = require("utils").dump
+local log = require("utils").log
 
 local has_words_before = function()
 	local line, col = unpack(vim.api.nvim_win_get_cursor(0))
@@ -20,38 +23,55 @@ return {
 			"hrsh7th/nvim-cmp",
 		},
 	},
+	{
+		"windwp/nvim-autopairs",
+		event = "InsertEnter",
+		config = function()
+			local autopairs = require("nvim-autopairs")
+
+			autopairs.setup({
+				check_ts = true, -- treesitter integration
+				disable_filetype = { "TelescopePrompt" },
+			})
+
+			local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+			local cmp_status_ok, cmp = pcall(require, "cmp")
+			if not cmp_status_ok then
+				return
+			end
+			cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({}))
+		end,
+	},
 	{
 		"hrsh7th/nvim-cmp",
 		event = "VimEnter",
 		dependencies = {
-			"hrsh7th/cmp-nvim-lsp",
-			"hrsh7th/cmp-buffer",
-			"lukas-reineke/cmp-under-comparator",
-			"hrsh7th/cmp-cmdline",
 			"f3fora/cmp-spell",
+			"hrsh7th/cmp-buffer",
+			"hrsh7th/cmp-calc",
+			"hrsh7th/cmp-cmdline",
+			"hrsh7th/cmp-emoji",
+			"hrsh7th/cmp-nvim-lsp",
 			"hrsh7th/cmp-nvim-lsp-document-symbol",
 			"hrsh7th/cmp-nvim-lsp-signature-help",
 			"hrsh7th/cmp-nvim-lua",
 			"hrsh7th/cmp-path",
-			"hrsh7th/cmp-vsnip",
+			"lukas-reineke/cmp-under-comparator",
 			"ray-x/cmp-treesitter",
-			"hrsh7th/cmp-emoji",
-			"hrsh7th/cmp-calc",
 		},
 		config = function()
 			local cmp = require("cmp")
 
 			local conditionalSources = cmp.config.sources({
-				{ name = "buffer", max_item_count = 5, keyword_length = 5, group_index = 2 },
+				{ name = "nvim_lsp", priority = 6 },
+				{ name = "nvim_lsp_signature_help", priority = 7 },
+				{ name = "luasnip", priority = 8 },
 				{ name = "calc" },
 				{ name = "crates" },
-				{ name = "nvim_lsp" },
-				{ name = "nvim_lsp_signature_help", priority = 5 },
 				{ name = "nvim_lua" },
+				{ name = "emoji" },
 				{ name = "path" },
 				{ name = "treesitter" },
-				{ name = "vsnip" },
-				{ name = "emoji" },
 				{
 					name = "spell",
 					option = {
@@ -61,9 +81,11 @@ return {
 						end,
 					},
 				},
+				{ name = "buffer", max_item_count = 5, keyword_length = 5 },
 			})
 
 			if use_google() then
+				require("cmp_nvim_ciderlsp").setup()
 				table.insert(conditionalSources, { name = "analysislsp" })
 				table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 9 })
 			else
@@ -103,8 +125,6 @@ return {
 					["<Tab>"] = cmp.mapping(function(fallback)
 						if cmp.visible() then
 							cmp.select_next_item()
-						elseif vim.fn["vsnip#available"](1) == 1 then
-							feedkey("<Plug>(vsnip-expand-or-jump)", "")
 						elseif has_words_before() then
 							cmp.complete()
 						else
@@ -115,16 +135,12 @@ return {
 					["<S-Tab>"] = cmp.mapping(function()
 						if cmp.visible() then
 							cmp.select_prev_item()
-						elseif vim.fn["vsnip#jumpable"](-1) == 1 then
-							feedkey("<Plug>(vsnip-jump-prev)", "")
 						end
 					end, { "i", "s" }),
 
 					["<Up>"] = cmp.mapping(function(fallback)
 						if cmp.visible() then
 							cmp.select_prev_item()
-						elseif vim.fn["vsnip#available"](1) == 1 then
-							feedkey("<Plug>(vsnip-jump-prev)", "")
 						else
 							fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
 						end
@@ -133,8 +149,6 @@ return {
 					["<Down>"] = cmp.mapping(function(fallback)
 						if cmp.visible() then
 							cmp.select_next_item()
-						elseif vim.fn["vsnip#available"](1) == 1 then
-							feedkey("<Plug>(vsnip-expand-or-jump)", "")
 						else
 							fallback() -- The fallback function sends a already mapped key. In this case, it's probably `<Tab>`.
 						end
@@ -153,41 +167,49 @@ return {
 						cmp.config.compare.sort_text,
 						cmp.config.compare.length,
 						cmp.config.compare.order,
+						cmp.config.compare.priority,
 					},
 				},
 
 				snippet = {
 					expand = function(args)
-						vim.fn["vsnip#anonymous"](args.body)
+						require("luasnip").lsp_expand(args.body)
 					end,
 				},
 
 				formatting = {
 					format = lspkind.cmp_format({
-						with_text = true,
+						mode = "symbol_text",
+						-- before = function(entry, vim_item)
+						--     if entry.source.name == "nvim_ciderlsp" then
+						--         if entry.completion_item.is_multiline then
+						--             -- multi-line specific formatting here
+						--             vim_item.menu = "  "
+						--         else
+						--             vim_item.menu = ""
+						--         end
+						--     end
+						--     return vim_item
+						-- end,
 						maxwidth = 40, -- half max width
 						menu = {
 							nvim_ciderlsp = "",
 							buffer = "",
 							crates = "",
-							nvim_lsp = "",
+							nvim_lsp = "[LSP]",
 							nvim_lua = "",
+							luasnip = "[LuaSnip]",
 							cmp_tabnine = "[TabNine]",
 							path = "[path]",
 							tmux = "[TMUX]",
-							vim_vsnip = "[snip]",
 						},
 					}),
 				},
 
 				experimental = {
-					ghost_text = false,
+					ghost_text = true,
 				},
 			})
-
-			vim.cmd(
-				[[ augroup CmpZsh au! autocmd Filetype zsh lua require'cmp'.setup.buffer { sources = { { name = "zsh" }, } } augroup END ]]
-			)
 		end,
 	},
 }

vim/.vim/lua/plugins/google.lua

@@ -9,7 +9,10 @@ local function goog(plugin, config)
 	}
 end
 
-if use_google() then
+if not use_google() then
+	return {}
+end
+
 return {
 	{
 		name = "maktaba",
@@ -45,15 +48,17 @@ if use_google() then
 		dependencies = { "maktaba", "glaive" },
 		config = function()
 			vim.cmd([[ Glaive relatedfiles plugin[mappings] ]])
-            end
+		end,
 	},
 	{
 		name = "codefmt",
 		dir = "/usr/share/vim/google/codefmt",
 		dependencies = { "maktaba", "glaive" },
 		config = function()
-                vim.cmd([[Glaive codefmt ktfmt_executable=`["/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style"]`]])
+			vim.cmd(
-            end
+				[[Glaive codefmt ktfmt_executable=`["/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style"]`]]
+			)
+		end,
 	},
 	{
 		name = "imp-google",
@@ -68,27 +73,27 @@ if use_google() then
 		dependencies = { "imp-google" },
 		keys = {
 			{ "<leader>ii", ":ImpSuggest <C-r><C-w><cr>" },
-            }
+		},
 	},
 	{
 		name = "ai.nvim",
-            url = 'sso://googler@user/vvvv/ai.nvim',
+		url = "sso://googler@user/vvvv/ai.nvim",
 	},
 	{
-            name = "cmp_nvim_ciderlsp",
+		name = "cmp-nvim-ciderlsp",
-            url = 'sso://googler@user/piloto/cmp-nvim-ciderlsp',
+		url = "sso://googler@user/piloto/cmp-nvim-ciderlsp",
-            lazy = false;
+		event = "VimEnter",
 		dependencies = {
-                'hrsh7th/nvim-cmp',
+			"hrsh7th/nvim-cmp",
-            }
+		},
 	},
 	{
-            name = "ciderlsp_nvim",
+		name = "ciderlsp-nvim",
-            url = 'sso://googler@user/kdark/ciderlsp-nvim',
+		url = "sso://googler@user/kdark/ciderlsp-nvim",
-            lazy = false;
+		event = "VimEnter",
 		dependencies = {
-                'hrsh7th/nvim-cmp',
+			"hrsh7th/nvim-cmp",
-            }
+		},
 	},
 	{
 		name = "nvim_figtree",
@@ -96,27 +101,33 @@ if use_google() then
 	},
 	{
 		name = "telescope_codesearch",
-            url = 'sso://googler@user/vintharas/telescope-codesearch.nvim',
+		url = "sso://googler@user/vintharas/telescope-codesearch.nvim",
-            dependencies = { 'nvim-telescope/telescope.nvim' },
+		dependencies = { "nvim-telescope/telescope.nvim" },
 	},
 	{
 		name = "telescope_citc",
-            url = 'sso://googler@user/aktau/telescope-citc.nvim',
+		url = "sso://googler@user/aktau/telescope-citc.nvim",
-            dependencies = { 'nvim-telescope/telescope.nvim' }
+		dependencies = { "nvim-telescope/telescope.nvim" },
 	},
 	{
 		name = "telescope_fig",
-            url = 'sso://googler@user/tylersaunders/telescope-fig.nvim',
+		url = "sso://googler@user/tylersaunders/telescope-fig.nvim",
-            dependencies = { 'nvim-telescope/telescope.nvim' }
+		dependencies = { "nvim-telescope/telescope.nvim" },
 	},
 	{
 		name = "google_comments",
-            url = 'sso://googler@user/chmnchiang/google-comments',
+		url = "sso://googler@user/chmnchiang/google-comments",
-            dependencies = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
+		dependencies = { "rcarriga/nvim-notify", "nvim-lua/plenary.nvim" },
 		config = function()
 			require("config.google-comments")
 		end,
 	},
+	{
+		url = "sso://googler@user/mccloskeybr/luasnip-google.nvim",
+		config = function()
+			require("luasnip-google").load_snippets()
+		end,
+	},
 	{
 		name = "hg",
 		url = "sso://googler@user/smwang/hg.nvim",
@@ -125,9 +136,5 @@ if use_google() then
 			require("config.fig")
 			require("hg").setup()
 		end,
+	},
 }
-    }
-else
-    return {}
-end
-

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

@@ -1,14 +1,15 @@
 return {
 	{
 		"neovim/nvim-lspconfig",
+		-- event = "VimEnter",
 		dependencies = {
+			"hrsh7th/nvim-cmp",
 			"nvim-lua/lsp-status.nvim",
 			"VonHeikemen/lsp-zero.nvim",
 			"rcarriga/nvim-notify",
 		},
 		config = function()
 			local use_google = require("utils").use_google
-			local log = require("utils").log
 			local notify = require("notify")
 
 			local lspconfig = require("lspconfig")
@@ -82,10 +83,10 @@ return {
 							"bzl",
 							"typescript",
 						},
-						root_dir = lspconfig.util.root_pattern("BUILD"),
+						-- required for proto generated files jump
-						-- root_dir = function(fname)
+						root_dir = function(fname)
-						--     return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
+							return string.match(fname, "(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$")
-						-- end;
+						end,
 						settings = {},
 					},
 				}
@@ -112,10 +113,9 @@ return {
 							"typescript",
 							"javascript",
 						},
-						root_dir = lspconfig.util.root_pattern("BUILD"),
+						root_dir = function(fname)
-						-- root_dir = function(fname)
+							return string.match(fname, "(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$")
-						--     return string.match(fname, '(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$')
+						end,
-						-- end;
 						settings = {},
 					},
 				}
@@ -140,10 +140,6 @@ return {
 
 			capabilities = vim.tbl_extend("keep", capabilities or {}, lsp_status.capabilities)
 
-			local runtime_path = vim.split(package.path, ";")
-			table.insert(runtime_path, "lua/?.lua")
-			table.insert(runtime_path, "lua/?/init.lua")
-
 			local my_on_attach = function(client, bufnr)
 				require("lualine").refresh()
 
@@ -180,9 +176,6 @@ return {
 			end
 
 			if use_google() then
-				require("cmp_nvim_ciderlsp").setup()
-
-				-- 3. Set up CiderLSP
 				local cider_on_attach = function(client, bufnr)
 					my_on_attach(client, bufnr)
 					vim.b["is_cider_lsp_attached"] = "no"

vim/.vim/lua/plugins/luasnip.lua

@@ -0,0 +1,10 @@
+return {
+	{
+		"L3MON4D3/LuaSnip",
+		-- follow latest release.
+		version = "<CurrentMajor>.*", -- Replace <CurrentMajor> by the latest released major (first number of latest release)
+		-- install jsregexp (optional!).
+		build = "make install_jsregexp",
+	},
+	{ "saadparwaiz1/cmp_luasnip" },
+}