style ignore and plugs

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

@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "4496b4cad69a862199bb3ad452d3c4988bb925a1" }
+  "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" }
 }

google/.blazerc

@@ -43,7 +43,7 @@ test --test_output=all --test_summary=detailed --build_tests_only
 
 import %workspace%/java/com/google/android/gmscore/blaze/blazerc
 build --config=gmscore_tap
-test --config=gmscore_test
-#
+test --config=gmscore_test_debug
+
 # https://g3doc.corp.google.com/devtools/blaze/g3doc/faq.md?cl=head#BlazeOom
 startup --host_jvm_args=-Xmx18G --host_jvm_args=-Xms18G

vim/.vim/lua/config/lsp-google.lua

@@ -61,7 +61,7 @@ function M.setup(capabilities)
 			local first_fire = vim.b["is_cider_lsp_attached"] == "no"
 			vim.b["is_cider_lsp_attached"] = "yes"
 			if first_fire then
-				vim.notify("CiderLSP attached", "info")
+				vim.notify("CiderLSP attached")
 				require("lualine").refresh()
 			end
 		end

vim/.vim/lua/config/zip.lua

@@ -0,0 +1,6 @@
+vim.api.nvim_create_autocmd({ "BufReadCmd" }, {
+	pattern = "*.srcjar",
+	callback = function()
+		vim.api.nvim_command("call zip#Browse(expand('<amatch>'))")
+	end,
+})

vim/.vim/lua/plugin_init.lua

@@ -14,3 +14,4 @@ package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua"
 
 require("lazy").setup("plugins")
 require("config.clipboard")
+require("config.zip")

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

@@ -2,14 +2,15 @@ local use_google = require("utils").use_google
 local buf_too_large = require("utils").buf_too_large
 
 return {
-	-- {
-	-- 	"m4xshen/hardtime.nvim",
-	-- 	dependencies = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim" },
-	-- 	opts = {},
-	-- },
+	"sindrets/diffview.nvim",
+	{
+		"folke/todo-comments.nvim",
+		dependencies = { "nvim-lua/plenary.nvim" },
+	},
 	{
 		"folke/flash.nvim",
 		event = "VeryLazy",
+		---@type Flash.Config
 		opts = {},
   -- stylua: ignore
   keys = {
@@ -20,6 +21,52 @@ return {
     { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
   },
 	},
+	{
+		"MagicDuck/grug-far.nvim",
+		config = function()
+			require("grug-far").setup({
+				-- search and replace engines configuration
+				engines = {
+					-- see https://github.com/BurntSushi/ripgrep
+					ripgrep = {
+						-- ripgrep executable to use, can be a different path if you need to configure
+						path = "rg",
+						extraArgs = "--.",
+					},
+				},
+			})
+		end,
+	},
+
+	{
+		"shellRaining/hlchunk.nvim",
+		event = { "BufReadPre", "BufNewFile" },
+		opts = {
+			line_num = { enable = true },
+			chunk = {
+				enable = true,
+				priority = 15,
+				style = {
+					{ fg = "#393d4c" },
+				},
+				chars = {
+					horizontal_line = "─",
+					-- vertical_line = "│",
+					vertical_line = "┊",
+					left_top = "╭",
+					left_bottom = "╰",
+					right_arrow = ">",
+				},
+				use_treesitter = true,
+				textobject = "",
+				max_file_size = 1024 * 1024,
+				error_sign = true,
+				-- animation related
+				duration = 0,
+				delay = 0,
+			},
+		},
+	},
 	{
 		"Bekaboo/dropbar.nvim",
 		-- optional, but required for fuzzy finder support
@@ -68,6 +115,7 @@ return {
 		"folke/persistence.nvim",
 		event = "BufReadPre", -- this will only start session saving when an actual file was opened
 		opts = {},
+  -- stylua: ignore
 		keys = {
 			{ "<leader>ss", [[<cmd>lua require("persistence").save()<cr>]] },
 			{ "<leader>sl", [[<cmd>lua require("persistence").load()<cr>]] },
@@ -95,6 +143,7 @@ return {
 		cmd = {
 			"Subs",
 		},
+  -- stylua: ignore
 		keys = {
 			{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
 		},
@@ -129,12 +178,14 @@ return {
 		config = function()
 			vim.g.undotree_SetFocusWhenToggle = 1
 		end,
+  -- stylua: ignore
 		keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
 	},
 	{
 		"stevearc/aerial.nvim",
 		opts = {},
 		cmd = { "AerialToggle", "AerialOn" },
+  -- stylua: ignore
 		keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
 	},
 	{
@@ -147,15 +198,12 @@ return {
 		-- Remove the following line to use development versions,
 		-- not just the formal releases
 		version = "*",
+  -- stylua: ignore
 		keys = {
 			{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
 			{ "<leader>dP", ":lua require('debugprint').debugprint({above = true})<cr>", desc = "Debug print" },
 			{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
-			{
-				"<leader>dQ",
-				":lua require('debugprint').debugprint({variable = true, above = true})<cr>",
-				desc = "Debug print",
-			},
+			{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
 		},
 	},
 }

vim/.vim/lua/plugins/dap.lua

@@ -16,6 +16,7 @@ return {
 			"rcarriga/nvim-dap-ui",
 			"nvim-telescope/telescope-dap.nvim",
 		},
+  -- stylua: ignore
 		keys = {
 			{ "<leader>do", ":lua require'dapui'.open()<CR>" },
 			-- { "<F5>", ":lua require'dap'.continue()<CR>" },

vim/.vim/lua/plugins/diagnostics.lua

@@ -13,9 +13,8 @@ return {
 		end,
 		keys = {
 			{ "<leader>xt", "<cmd>:Telescope diagnostics<CR>" },
-			{ "gr", ":Trouble lsp_references<CR>" },
-			{ "<leader>xw", ":Trouble workspace_diagnostics<CR>" },
-			{ "<leader>xd", ":Trouble document_diagnostics<CR>" },
+			{ "gr", ":Telescope lsp_references<CR>" },
+			{ "<leader>xd", ":Trouble<CR>" },
 			{ "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
 			{ "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
 		},

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

@@ -94,6 +94,7 @@ return {
 		},
 	}),
 	glug("relatedfiles", {
+  -- stylua: ignore
 		keys = {
 			{ "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
 			{ "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
@@ -316,7 +317,7 @@ return {
 		config = function()
 			-- Here are all the options and their default values:
 			require("critique.comments").setup({
-				debug = 1, -- default = 0
+				-- debug = 1, -- default = 0
 				-- Fetch the comments after calling `setup`.
 				auto_fetch = true, -- default = true
 				auto_render = true, -- default = true

vim/.vim/lua/plugins/harpoon.lua

@@ -64,6 +64,7 @@ return {
 			toggle_telescope(harpoon:list())
 		end, { desc = "Open harpoon window" })
 	end,
+	-- stylua: ignore
 	-- keys = {
 	-- 	-- Mark current file
 	-- 	{ "<leader>m", ":lua require('harpoon').mark_file()<CR>" },

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

@@ -97,6 +97,7 @@ return {
 			"nvim-lua/lsp-status.nvim",
 			"VonHeikemen/lsp-zero.nvim",
 		},
+  -- stylua: ignore
 		keys = {
 			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
 			-- { "?", "<cmd>lua vim.lsp.buf.code_action()<CR>" },

vim/.vim/lua/plugins/neotree.lua

@@ -38,6 +38,7 @@ return {
 				},
 			})
 		end,
+  -- stylua: ignore
 		keys = {
 			(function()
 				if use_google() then

vim/.vim/lua/plugins/notify.lua

@@ -1,49 +1,47 @@
 return {
-	{
-		"rcarriga/nvim-notify",
-		event = "VimEnter",
-		cond = true,
-		lazy = true,
-		config = function()
-			-- local colors = require("catppuccin.palettes").get_palette()
-			require("notify").setup({
-				-- background_colour = colors.base,
-				fps = 20, -- default 30
-				-- stages = "slide", -- default fade_in_slide_out
-				timeout = 5000, -- default 5000
-				render = "wrapped-compact",
-			})
-			vim.notify = require("notify")
-		end,
-	},
-	{
-		"j-hui/fidget.nvim",
-		event = "VimEnter",
-		cond = false,
-		opts = {
-			progress = {
-				display = {
-					done_ttl = 5,
-					done_icon = "󰞑 ",
-				},
-			},
-			notification = {
-				override_vim_notify = true,
-			},
-		},
-	},
 	-- {
-	-- 	"echasnovski/mini.notify",
-	-- 	version = false,
-	-- 	dependencies = {
-	-- 		"rcarriga/nvim-notify",
-	-- 		"j-hui/fidget.nvim",
-	-- 	},
+	-- 	"rcarriga/nvim-notify",
+	-- 	event = "VimEnter",
+	-- 	cond = true,
+	-- 	lazy = true,
 	-- 	config = function()
-	-- 		vim.notify = function(msg, level, opts)
-	-- 			require("fidget").notify(msg, level, opts)
-	-- 			require("mini.notify").make_notify()(msg, level, opts)
-	-- 		end
+	-- 		-- local colors = require("catppuccin.palettes").get_palette()
+	-- 		require("notify").setup({
+	-- 			-- background_colour = colors.base,
+	-- 			fps = 20, -- default 30
+	-- 			stages = "slide", -- default fade_in_slide_out
+	-- 			timeout = 5000, -- default 5000
+	-- 			render = "wrapped-compact",
+	-- 		})
+	-- 		vim.notify = require("notify")
 	-- 	end,
 	-- },
+	-- {
+	-- 	"j-hui/fidget.nvim",
+	-- 	event = "VimEnter",
+	-- 	-- cond = false,
+	-- 	opts = {
+	-- 		progress = {
+	-- 			display = {
+	-- 				done_ttl = 5,
+	-- 				done_icon = "󰞑 ",
+	-- 			},
+	-- 		},
+	-- 		notification = {
+	-- 			override_vim_notify = true,
+	-- 		},
+	-- 	},
+	-- },
+	{
+		"echasnovski/mini.notify",
+		version = false,
+		dependencies = {
+			"rcarriga/nvim-notify",
+			-- "j-hui/fidget.nvim",
+		},
+		config = function()
+			vim.api.nvim_create_user_command("Notifications", require("mini.notify").show_history, {})
+			vim.notify = require("mini.notify").make_notify()
+		end,
+	},
 }

vim/.vim/lua/plugins/paint.lua

@@ -1,7 +1,8 @@
 return {
 	"folke/paint.nvim",
 	config = function()
-		vim.api.nvim_set_hl(0, "LightPurple", { fg = "#7f67c5" })
+		vim.api.nvim_set_hl(0, "NievesLightPurple", { fg = "#7f67c5" })
+		vim.api.nvim_set_hl(0, "NievesViolet", { fg = "#4000f0", bold = true })
 
 		require("paint").setup({
 			highlights = {
@@ -31,10 +32,10 @@ return {
 				-- },
 				--
 				-- WASM
-				{ pattern = "(W)ASM", hl = "LightRed", filter = {} },
-				{ pattern = "W(A)SM", hl = "LightBlue", filter = {} },
-				{ pattern = "WA(S)M", hl = "LightGreen", filter = {} },
-				{ pattern = "WAS(M)", hl = "LightYellow", filter = {} },
+				-- { pattern = "(W)ASM", hl = "LightRed", filter = {} },
+				-- { pattern = "W(A)SM", hl = "LightBlue", filter = {} },
+				-- { pattern = "WA(S)M", hl = "LightGreen", filter = {} },
+				-- { pattern = "WAS(M)", hl = "LightYellow", filter = {} },
 
 				-- Google
 				-- { pattern = "Google", hl = "LightBlue", filter = {} },
@@ -46,8 +47,10 @@ return {
 				-- { pattern = "Googl(e)", hl = "LightRed", filter = {} },
 
 				-- cnieves
-				{ pattern = "cnieves", hl = "LightPurple", filter = {} },
-				{ pattern = "Christian Nieves", hl = "LightPurple", filter = {} },
+				-- { pattern = "cnieves", hl = "LightPurple", filter = {} },
+				-- { pattern = "Christian Nieves", hl = "LightPurple", filter = {} },
+				{ pattern = "Christian Nieves", hl = "NievesViolet", filter = {} },
+				{ pattern = "Christian Nieves", hl = "NievesLightPurple", filter = {} },
 			},
 		})
 	end,

vim/.vim/lua/plugins/refactoring.lua

@@ -8,34 +8,16 @@ return {
 		config = function()
 			require("config.refactoring")
 		end,
+  -- stylua: ignore
 		keys = {
 			-- remap to open the Telescope refactoring menu in visual mode
-			{
-				"<leader>R",
-				"<cmd>lua require('telescope').extensions.refactoring.refactors()<CR>",
-			},
+			{ "<leader>R", "<cmd>lua require('telescope').extensions.refactoring.refactors()<CR>", },
 
 			-- Remaps for the refactoring operations currently offered by the plugin
-			{
-				"<leader>rx",
-				[[ <Cmd>lua require('refactoring').refactor('Extract Function')<CR>]],
-				mode = "v",
-			},
-			{
-				"<leader>rxf",
-				[[ <Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]],
-				mode = "v",
-			},
-			{
-				"<leader>rxv",
-				[[ <Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]],
-				mode = "v",
-			},
-			{
-				"<leader>ri",
-				[[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]],
-				mode = "v",
-			},
+			{ "<leader>rx", [[ <Cmd>lua require('refactoring').refactor('Extract Function')<CR>]], mode = "v", },
+			{ "<leader>rxf", [[ <Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]], mode = "v", },
+			{ "<leader>rxv", [[ <Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]], mode = "v", },
+			{ "<leader>ri", [[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]], mode = "v", },
 		},
 	},
 }

vim/.vim/lua/plugins/signify.lua

@@ -53,6 +53,7 @@ end
 return {
 	"mhinz/vim-signify",
 	event = "VimEnter",
+  -- stylua: ignore
 	keys = {
 		{ "]d", "<plug>(signify-next-hunk)" },
 		{ "[d", "<plug>(signify-prev-hunk)" },

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

@@ -47,6 +47,7 @@ function fig_all_modified()
 	return exe("hg status -ma -n --rev p4base --no-status --template= | sort")
 end
 
+  -- stylua: ignore
 local keys = {
 	{ "<leader>e", ":lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
 	{ "<leader>ts.", ":lua live_grep({vim.fn.getcwd()})<CR>", desc = "Search in CWD" },
@@ -67,18 +68,16 @@ local keys = {
 }
 
 if use_google() then
+  -- stylua: ignore
 	TableConcat(keys, {
 		{ "<leader>tm", ":lua find_files(fig_modified())<CR>" },
 		{ "<leader>tM", ":lua find_files(fig_all_modified())<CR>" },
-		{ "<leader>tF", ":lua live_grep(fig_all_modified())<CR>", desc = "Search in *all* modified Fig files." },
 		{ "<leader>tf", ":lua live_grep(fig_modified())<CR>", desc = "Search in modified Fig files." },
-		{ "<C-P>", [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]], "n" },
-		{ "<leader>cs", [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]] },
-		{ "<leader>cs", [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]], mode = "v" },
-		{
-			"<leader>CS",
-			[[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
-		},
+		{ "<leader>tF", ":lua live_grep(fig_all_modified())<CR>", desc = "Search in *all* modified Fig files." },
+		{ "<C-P>", require("telescope").extensions.codesearch.find_files },
+		{ "<leader>cs", require("telescope").extensions.codesearch.find_query },
+		{ "<leader>cs", require("telescope").extensions.codesearch.find_query, mode = "v" },
+		{ "<leader>CS", [[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]], },
 	})
 end
 
@@ -166,7 +165,6 @@ return {
 						},
 						i = {
 							["<C-c>"] = require("telescope.actions").close,
-							["<Esc>"] = require("telescope.actions").close,
 							["<S-Down>"] = function()
 								require("telescope.actions").cycle_history_next()
 							end,

vim/.vim/lua/plugins/whichkey.lua

@@ -7,14 +7,11 @@ return {
 	end,
 	config = function()
 		require("which-key").setup({})
-		-- local wk = require("which-key")
-		--
-		-- wk.register({ [";"] = { ":" } }, { mode = "v" })
-		-- wk.register({ [";"] = { ":" } }, { mode = "n" })
-		--
-		-- wk.register({
-		--     ["%%"] = { '<C-R>=fnameescape(expand("%:p:h")."/")<CR>', "Current File Directory" },
-		-- }, { mode = "c" })
+		local wk = require("which-key")
+		wk.register({
+			["%%"] = { '<C-R>=fnameescape(expand("%:p:h")."/")<CR>', "Current File Directory" },
+			["%."] = { "<C-R>%", "Current File" },
+		}, { mode = "c" })
 		--
 		-- wk.register({
 		--     ["jk"] = { "<esc>" },

vim/.vim/prefs/mappings.vim

@@ -12,8 +12,6 @@ map <Esc>[D <Left>
 " remove mapping to be used in nerdtree
 inoremap <Nul> <C-n>
 
-cnoremap %% <C-R>=fnameescape(expand("%:p:h")."/")<CR>
-
 " move vertically by visual line
 " nnoremap j gj
 " nnoremap k gk

vim/.vimrc

@@ -124,5 +124,7 @@ let g:loaded_netrwPlugin       = 0
 let g:loaded_tutor_mode_plugin = 0
 let g:loaded_remote_plugins    = 1
 
+au BufRead,BufNewFile,BufReadPost *.cc.inc set filetype=cpp
+
 filetype plugin indent on
 syntax on