fix DAP config

config/.config/nvim/after/ftplugin/bzl.vim

@@ -0,0 +1,4 @@
+set expandtab
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4

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

@@ -1,14 +1,14 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" },
-  "actions-preview.nvim": { "branch": "master", "commit": "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab" },
+  "actions-preview.nvim": { "branch": "master", "commit": "9e86d014a72a4121ee27f3d8952e1ea868c3c8c4" },
-  "aerial.nvim": { "branch": "master", "commit": "e9661d4f739508377f42528fd08a85c4c8feba6e" },
+  "aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" },
   "ai.nvim": { "branch": "main", "commit": "ab6b6f54612500f48d4d34fcf81529946b9338f3" },
-  "asyncrun.vim": { "branch": "master", "commit": "61cc3081963a12048e00e89f8cedc8bd1cb83b8c" },
+  "asyncrun.vim": { "branch": "master", "commit": "99b5025131c50c6ef638faefe1f872eea5454785" },
   "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" },
-  "catppuccin": { "branch": "main", "commit": "c2e6f8e7eb8d0ebf55700c89bdf842809aeecf09" },
+  "catppuccin": { "branch": "main", "commit": "9703f227bfab20d04bcee62d2f08f1795723b4ae" },
   "ciderlsp-nvim": { "branch": "main", "commit": "16d7b742ad22a5534a22d2ba06516ab611ab1e7b" },
-  "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" },
+  "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
@@ -18,98 +18,98 @@
   "cmp-nvim-ciderlsp": { "branch": "main", "commit": "e1b0015a0c090e20d1cbb34e5639e6dd145d3f3e" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
-  "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
   "cmp-treesitter": { "branch": "master", "commit": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d" },
   "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
-  "conform.nvim": { "branch": "master", "commit": "4588008a7c5b57fbff97fdfb529c059235cdc7ee" },
+  "conform.nvim": { "branch": "master", "commit": "61cff430c9f15770d0c5e68c1b08067223bd94ab" },
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
-  "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" },
+  "dashboard-nvim": { "branch": "master", "commit": "413442b12d85315fc626c44a0ce4929b213ef604" },
   "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" },
   "ferris.nvim": { "branch": "main", "commit": "52e39c017f511e8cf9a024022d48164bfbfe52ee" },
-  "fidget.nvim": { "branch": "main", "commit": "1d1042d418ee8cb70d68f1e38db639844331c093" },
+  "fidget.nvim": { "branch": "main", "commit": "4e854f3299e21d1c18279add340428a97520fc44" },
   "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" },
-  "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
+  "friendly-snippets": { "branch": "main", "commit": "5cc1f45c6aac699ad008fb85f6ae03236062667d" },
-  "fzf": { "branch": "master", "commit": "dd886d22f0b95700ece24954ac00f6e2628226f1" },
+  "fzf": { "branch": "master", "commit": "7a72f1a2531d728d14faf5f61909f9ffa63c8dd3" },
-  "fzf.vim": { "branch": "master", "commit": "f6cb5b17897ff0c38f60fecd4b529678bcfec259" },
+  "fzf.vim": { "branch": "master", "commit": "8ea9574b3ebdc44fbe3dc6381a13f9ce0c290e2f" },
-  "gcert.nvim": { "branch": "main", "commit": "8b4b68ce8eeaf54240b55a28081d3a2be1631e95" },
+  "gcert.nvim": { "branch": "main", "commit": "b7048d03b6d772f7145f6d5f73379f38c0a91edc" },
   "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" },
-  "go.nvim": { "branch": "master", "commit": "24d2fa373d55d9900cd4b502a88214dc17e6fab6" },
+  "go.nvim": { "branch": "master", "commit": "d748e79011437d5b080006b896b3c296656641d7" },
   "googlepaths.nvim": { "branch": "main", "commit": "b46baaaec3f5dbf634d2ea722bb89c376f4eaecb" },
   "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" },
   "hg": { "branch": "main", "commit": "1c4bdf80174ec840ba76c4dc7032c4313db62199" },
   "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
-  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
+  "kanagawa.nvim": { "branch": "master", "commit": "ab41956c4559c3eb21e713fcdf54cda1cb6d5f40" },
   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
   "lazygit.nvim": { "branch": "main", "commit": "1e08e3f5ac1152339690140e61a4a32b3bdc7de5" },
-  "leap.nvim": { "branch": "main", "commit": "14eda5bb233354933baa99b6d40bef3a40dbeaae" },
+  "leap.nvim": { "branch": "main", "commit": "52f7ce4fcc1764caac77cf4d43c2c4f5fb42d517" },
   "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
   "lsp-virtual-improved.nvim": { "branch": "master", "commit": "db9cd544b7febdf4c48374e351b3903143b4477d" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "e14aa165d820fc8943704c273e27fbce4a96b29f" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "abac76482ec3012a2b359ba956a74e2ffd33d46f" },
   "lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" },
   "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
   "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
   "luasnip-google.nvim": { "branch": "main", "commit": "5fd7feb144de0ecea837618c9c9e1bbecc0e3243" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "fe4cce44dec93c69be17dad79b21de867dde118a" },
   "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
-  "mellifluous.nvim": { "branch": "main", "commit": "da719202489e37e3d5de29b5a0d650fa7f980cfd" },
+  "mellifluous.nvim": { "branch": "main", "commit": "a72e8ea11da924d75101a4bbf7a325e4d56802a5" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
-  "neodev.nvim": { "branch": "main", "commit": "345ed5843405126464119154f394d4298c1314c7" },
+  "neodev.nvim": { "branch": "main", "commit": "de3685b8c1cd439dd96b7958793f6f381f98652d" },
   "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" },
-  "neovim-ayu": { "branch": "master", "commit": "6463d39253bb70e2b867fce57f9e7174f657bd1b" },
+  "neovim-ayu": { "branch": "master", "commit": "0a9804db5c08dba63be9774a57e4214fd0473ce1" },
   "neovim-throttle-debounce": { "branch": "main", "commit": "5247b097df15016ab31db672b77ec4938bb9cbfd" },
-  "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
+  "nui.nvim": { "branch": "main", "commit": "af7dfee12fbf51d12cfc6ee386fa54f7a5a573c8" },
-  "nvgoog": { "branch": "main", "commit": "1a4905bc039dd3c3db9899ff474de54d2efbb722" },
+  "nvgoog": { "branch": "main", "commit": "960bbdf9bd30df0ccf7a5ab74e49be3ac9f4d8bd" },
-  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
+  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
   "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
   "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" },
   "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
-  "nvim-hlslens": { "branch": "main", "commit": "8ffc64bb6b624612cf762982b92633f283f7a715" },
+  "nvim-hlslens": { "branch": "main", "commit": "e4c811a401b06f86a7bb042b1d64a5cba21729a9" },
-  "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" },
+  "nvim-jdtls": { "branch": "master", "commit": "894c044034e0d5f78a22602f1440bfe70aff58ee" },
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lint": { "branch": "master", "commit": "8e5920f9ce9f24c283a2e64be5fe58d1d37d1744" },
+  "nvim-lint": { "branch": "master", "commit": "31be66c27214174a28fc092ffcf4bb3e8f6cfd43" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d9e87768466f91c071375517b170da5fad7b41f5" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d1bab4cf4b69e49d6058028fd933d8ef5e74e680" },
   "nvim-luapad": { "branch": "master", "commit": "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce" },
   "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
   "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
-  "nvim-treesitter": { "branch": "master", "commit": "ba6454783493ac3a5dd209c25e491640b07bd8de" },
+  "nvim-treesitter": { "branch": "master", "commit": "504fe1043298c468f56a6ef6dc61f35b2d69495a" },
-  "nvim-web-devicons": { "branch": "master", "commit": "aaec87dbdaa776bfa0a13c8694bec9bcb7454719" },
+  "nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" },
   "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4be2e8689067494ed7e5a4f1221adc31d1a07783" },
   "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" },
   "persisted.nvim": { "branch": "main", "commit": "edd8aa41cd87f9da1b6ef0c584068dea192f65b7" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
-  "refactoring.nvim": { "branch": "master", "commit": "aff2e21e2f1a19d302adceb4e7d0fafbb3ae59a9" },
+  "refactoring.nvim": { "branch": "master", "commit": "fb4990a0546c59136930ea624b8640d07957f281" },
   "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" },
   "scope.nvim": { "branch": "main", "commit": "cd27af77ad61a7199af5c28d27013fb956eb0e3e" },
-  "sonokai": { "branch": "master", "commit": "42822f8f9b3a5088f05cf72a0aa1477598ad1a40" },
+  "sonokai": { "branch": "master", "commit": "a62656a798043f3c6b603efa98d4de2da89c72b2" },
   "tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" },
   "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
   "telescope-import.nvim": { "branch": "main", "commit": "08e31708451b43d1ef766d370d5ef17e9f0c24ae" },
-  "telescope.nvim": { "branch": "master", "commit": "e54fbf4ab2b64640b639b75c006c23b4bc51c86f" },
+  "telescope.nvim": { "branch": "master", "commit": "45d61cc8da213e4052cf698653692b6a4c961760" },
   "telescope_citc": { "branch": "main", "commit": "56eae89663154f0ccbd4bfd1259d4a56e383abb1" },
   "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
   "telescope_fig": { "branch": "main", "commit": "f6122fe82417ebeaddb9343cfd5584f62a4b8df8" },
-  "text-case.nvim": { "branch": "main", "commit": "6bc91cde614bbec6f0befbaf7fcd302415d803fb" },
+  "text-case.nvim": { "branch": "main", "commit": "5d85b7495c3cf8e842e4d2528edc68e6fe7c92c8" },
   "time-ago.vim": { "branch": "master", "commit": "be978d5c790cfcc41f524205f28783b9937fd0ee" },
   "tree-sitter-gdscript": { "branch": "master", "commit": "03f20b94707a21bed90bb95101684bc4036139ce" },
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
-  "undotree": { "branch": "master", "commit": "a1758ba9990b7189f601a3a5acdfc8ca3907a700" },
+  "undotree": { "branch": "master", "commit": "9dbbf3b7d19dda0d22ceca461818e4739ad8154d" },
   "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
   "vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" },
   "vim-better-whitespace": { "branch": "master", "commit": "029f35c783f1b504f9be086b9ea757a36059c846" },
   "vim-conjoin": { "branch": "master", "commit": "2ea3b8ed994d12bbf255825d973d865621c64860" },
-  "vim-floaterm": { "branch": "master", "commit": "3f01a623376957437f9376327637491b74719e38" },
+  "vim-floaterm": { "branch": "master", "commit": "97c085b2f69e931ed78bb1c260512d1e0492a754" },
   "vim-imp": { "branch": "main", "commit": "fe9be485854ba602059f0d8af4fa4ab0a74d61ac" },
   "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
-  "vim-matchup": { "branch": "master", "commit": "e2cca1747ab175b8d839a5d28679427564643a57" },
+  "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" },
   "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" },
   "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
   "vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" },

google/.blazerc

@@ -26,14 +26,13 @@
 # --order_output=no: By default, blaze query orders the outputs. This can be expensive,
 #     so this flag disables the ordering step.
 build --nostamp
-# build --workspace_status_command=/bin/true
+build --workspace_status_command=/bin/true
-# build --experimental_spawn_scheduler
 build --trim_test_configuration
 build --show_progress_rate_limit=1
-# query --order_output=no
 
 # --test_output / --test_summary obviously don’t do anything for performance,
 # keep them if you like what they do.
+test --test_output=all --test_summary=detailed --build_tests_only
 # test --test_output=errors --test_summary=detailed --build_tests_only
 
 # In C++, failing tests will print a lot of noisy thread output. Use
@@ -43,9 +42,8 @@ build --show_progress_rate_limit=1
 # test --test_arg=--undefok=suppress_failure_output --test_arg=--suppress_failure_output
 
 import %workspace%/java/com/google/android/gmscore/blaze/blazerc
-build --config=gmscore_tap
+# build --config=gmscore_arm64
-test --config=gmscore_test
+# test --config=gmscore_test
-test --test_output=all
 #
 # 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

@@ -11,7 +11,7 @@ function M.setup(capabilities)
 					"/google/bin/releases/cider/ciderlsp/ciderlsp",
 					"--tooltag=nvim-lsp",
 					"--forward_sync_responses",
-					"--debug_relay",
+					-- "--debug_relay",
 				},
 				offset_encoding = "utf-8",
 				filetypes = {

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

@@ -15,7 +15,29 @@ return {
 	{ "andymass/vim-matchup", event = "VimEnter" },
 	{ "jghauser/mkdir.nvim", event = "BufWritePre" },
 	{
-		"andweeb/presence.nvim", -- session management
+		"johmsalas/text-case.nvim",
+		dependencies = { "nvim-telescope/telescope.nvim" },
+		config = function()
+			require("textcase").setup({})
+			require("telescope").load_extension("textcase")
+		end,
+		cmd = {
+			"Subs",
+		},
+		keys = {
+			{ "<leader>t", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
+		},
+	},
+	{
+		"NvChad/nvim-colorizer.lua",
+		ft = "lua",
+		config = function()
+			require("colorizer").setup()
+		end,
+	},
+	{
+
+		"andweeb/presence.nvim",
 		cond = not use_google(),
 		config = function()
 			require("presence").setup({
@@ -36,6 +58,7 @@ return {
 		config = function()
 			vim.g.undotree_SetFocusWhenToggle = 1
 		end,
+		keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
 	},
 	{
 		"stevearc/aerial.nvim",

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

@@ -30,7 +30,7 @@ return {
 			"hrsh7th/cmp-emoji",
 			"hrsh7th/cmp-nvim-lsp",
 			"hrsh7th/cmp-nvim-lsp-document-symbol",
-			"hrsh7th/cmp-nvim-lsp-signature-help",
+			-- "hrsh7th/cmp-nvim-lsp-signature-help",
 			"hrsh7th/cmp-nvim-lua",
 			"lukas-reineke/cmp-under-comparator",
 			"onsails/lspkind.nvim",
@@ -68,7 +68,7 @@ return {
 			cmp.setup.cmdline(":", {
 				mapping = cmp.mapping.preset.cmdline(),
 				sources = cmp.config.sources({
-					{ name = "nvim_lsp_signature_help", priority = 9 },
+					-- { name = "nvim_lsp_signature_help", priority = 9 },
 					{ name = "async_path" },
 					{ name = "cmdline", option = { ignore_cmds = { "edit", "write", "tabedit" } } },
 				}),
@@ -78,7 +78,7 @@ return {
 				preselect = cmp.PreselectMode.None,
 				sources = cmp.config.sources(
 					require("utils").TableConcat(conditionalSources, {
-						{ name = "nvim_lsp_signature_help", priority = 9 },
+						-- { name = "nvim_lsp_signature_help", priority = 9 },
 						-- Conditional sources injected here.
 						{ name = "luasnip", priority = 7 },
 						{ name = "nvim_lsp", priority = 6 },
@@ -126,7 +126,7 @@ return {
 							nerdfont = "󰊪 nerdfont",
 							nvim_ciderlsp = "󰚩 Cider",
 							analysislsp = "󰟌 analysislsp",
-							nvim_lsp_signature_help = "󰊕",
+							-- nvim_lsp_signature_help = "󰊕",
 							nvim_lsp = " LSP",
 							nvim_lua = " lua",
 							treesitter = "󰙅 ts",

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

@@ -75,11 +75,13 @@ return {
 					request = "attach",
 					mode = "remote",
 					name = "Attach Remote",
-					attachCommands = { "gdb-remote 5555" },
+					attachCommands = { "gdb-remote localhost:5555" },
 					-- hostName = "127.0.0.1",
 					-- port = 5555,
 				},
 			}
+			dap.configurations.c = dap.configurations.cpp
+
 			dap.configurations.java = {
 				{
 					type = "java",
@@ -91,6 +93,7 @@ return {
 					port = 5005,
 				},
 			}
+
 			dap.configurations.gdscript = {
 				{
 					name = "Launch Project",

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

@@ -43,9 +43,7 @@ return {
 				vim.diagnostic.config({
 					severity_sort = true,
 					virtual_text = false,
-					virtual_improved = {
+					virtual_improved = { current_line = "hide" },
-						current_line = "hide",
-					},
 					virtual_lines = { highlight_whole_line = false, only_current_line = true },
 				})
 			end)
@@ -54,16 +52,13 @@ return {
 			{
 				"<leader>l",
 				function()
-					local new_value = not vim.diagnostic.config().virtual_lines.only_current_line
+					if vim.diagnostic.config().virtual_improved then
-					vim.diagnostic.config({
+						vim.diagnostic.config({ virtual_improved = false })
-						virtual_improved = {
+					else
-							current_line = new_value and "default" or "hide",
+						vim.diagnostic.config({ virtual_improved = { current_line = "hide" } })
-						},
+					end
-						virtual_lines = { only_current_line = new_value },
-					})
-					return new_value
 				end,
-				desc = "Toggle LSP Lines",
+				desc = "Toggle Virtual Text",
 			},
 		},
 	},

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

@@ -56,8 +56,9 @@ return {
 	veryLazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
 	veryLazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
 	veryLazy(glug("ft-python", { event = "BufRead,BufNewFile *.py" })),
+
 	-- Configures nvim to respect Google's coding style
-	veryLazy(glug("googlestyle", { event = { "BufRead", "BufNewFile" } })),
+	-- glug("googlestyle", { event = { "BufRead", "BufNewFile" } }),
 
 	veryLazy(glug("add_usings")),
 	-- Autogens boilerplate when creating new files
@@ -94,18 +95,10 @@ return {
 	}),
 	glug("relatedfiles", {
 		keys = {
-			{
+			{ "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
-				"<leader>rb",
+			{ "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
-				":exec relatedfiles#selector#JumpToBuild()<CR>",
+			{ "<leader>rh", ":exec relatedfiles#selector#JumpToHeader()<CR>" },
-			},
+			{ "<leader>rc", ":exec relatedfiles#selector#JumpToCodeFile()<CR>" },
-			{
-				"<leader>rt",
-				":exec relatedfiles#selector#JumpToTestFile()<CR>",
-			},
-			{
-				"<leader>rc",
-				":exec relatedfiles#selector#JumpToCodeFile()<CR>",
-			},
 		},
 	}),
 	{ "junegunn/fzf", dir = "~/.fzf", build = "./install --all" },
@@ -181,19 +174,6 @@ return {
 		end,
 	}),
 
-	glug("critique", {
-		dependencies = {
-			veryLazy(glug("googler")),
-		},
-		-- optional = true,
-		cmd = {
-			"CritiqueComments",
-			"CritiqueUnresolvedComments",
-			"CritiqueNextComment",
-			"CritiquePreviousComment",
-		},
-	}),
-
 	-- Run blaze commands
 	glug("blaze", {
 		dependencies = {
@@ -315,6 +295,16 @@ return {
 			"nvim-telescope/telescope.nvim",
 			"runiq/neovim-throttle-debounce",
 		},
+		-- here are some mappings you might want:
+		keys = {
+			{ "]c", ":CritiqueGotoNextComment<CR>" },
+			{ "[c", ":CritiqueGotoPrevComment<CR>" },
+			{ "<Leader>lc", ":CritiqueToggleLineComment<CR>" },
+			{ "<Leader>uc", ":CritiqueToggleUnresolvedComments<CR>" },
+			{ "<Leader>ac", ":CritiqueToggleAllComments<CR>" },
+			{ "<Leader>fc", ":CritiqueFetchComments<CR>" },
+			{ "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
+		},
 		config = function()
 			-- Here are all the options and their default values:
 			require("critique.comments").setup({
@@ -325,15 +315,6 @@ return {
 				frequent_fetch = true, -- default = false
 				verbose_notifications = true,
 			})
-			local map = require("utils").map
-			-- here are some mappings you might want:
-			map("n", "]c", [[<Cmd>CritiqueGotoNextComment<CR>]])
-			map("n", "[c", [[<Cmd>CritiqueGotoPrevComment<CR>]])
-			map("n", "<Leader>lc", [[<Cmd>CritiqueToggleLineComment<CR>]])
-			map("n", "<Leader>uc", [[<Cmd>CritiqueToggleUnresolvedComments<CR>]])
-			map("n", "<Leader>ac", [[<Cmd>CritiqueToggleAllComments<CR>]])
-			map("n", "<Leader>fc", [[<Cmd>CritiqueFetchComments<CR>]])
-			map("n", "<Leader>tc", [[<Cmd>CritiqueCommentsTelescope<CR>]])
 		end,
 	},
 	{

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

@@ -1,6 +1,17 @@
 local use_google = require("utils").use_google
 
 return {
+	{
+		"ray-x/lsp_signature.nvim",
+		event = "VeryLazy",
+		opts = {
+			floating_window = true,
+			hint_prefix = "󰡱 ",
+		},
+		config = function(_, opts)
+			require("lsp_signature").setup(opts)
+		end,
+	},
 	{
 		"luozhiya/lsp-virtual-improved.nvim",
 		event = { "LspAttach" },
@@ -66,8 +77,8 @@ return {
 			{ "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
 			{ "gI", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
 			{ "gR", "<cmd>lua vim.lsp.buf.references()<CR>" },
-			{ "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
 			{ "gt", "<cmd>lua vim.lsp.buf.type_definition()<CR>" },
+			{ "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
 			{ "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
 			{ "<leader>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", mode = "v" },
 		},

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

@@ -88,17 +88,6 @@ return {
 			{ "?", "<cmd>lua require('actions-preview').code_actions()<cr>" },
 		},
 	},
-	{
-		"johmsalas/text-case.nvim",
-		dependencies = { "nvim-telescope/telescope.nvim" },
-		config = function()
-			require("textcase").setup({})
-			require("telescope").load_extension("textcase")
-		end,
-		keys = {
-			{ "<leader>t", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
-		},
-	},
 	{
 		"piersolenski/telescope-import.nvim",
 		dependencies = "nvim-telescope/telescope.nvim",

vim/.vimrc

@@ -23,11 +23,9 @@ let &t_AF="\e[38;5;%dm"
 
 set laststatus=2
 set cmdheight=1
-set ttyfast
 set relativenumber
 set copyindent
 set preserveindent
-" set lazyredraw " Enable if running slow...
 set autoindent
 
 set wrap
@@ -57,6 +55,7 @@ set shortmess=A " disable swap
 set shortmess+=O
 set modifiable
 set noscrollbind
+set expandtab
 
 set updatetime=100
 
@@ -117,8 +116,8 @@ let g:loaded_zipPlugin         = 1
 let g:loaded_2html_plugin      = 1
 let g:loaded_shada_plugin      = 1
 let g:loaded_spellfile_plugin  = 1
-let g:loaded_netrwPlugin       = 1
+let g:loaded_netrwPlugin       = 0
-let g:loaded_tutor_mode_plugin = 1
+let g:loaded_tutor_mode_plugin = 0
 let g:loaded_remote_plugins    = 1
 
 set mouse=