fix conform

alacritty/.alacritty.toml

@@ -1,6 +1,6 @@
 [font]
-size = 12
+size = 14
-normal = { family = "ComicCodeLigatures Nerd Font Light" }
+normal = { family = "CommitMono Nerd Font" }
 
 [window]
 option_as_alt = "OnlyLeft"
@@ -13,35 +13,37 @@ decorations = "None"
 [colors]
 draw_bold_text_with_bright_colors = true
 
+# Default colors
+[colors.primary]
+background = '#1e2024'
+foreground = '#a1a3a8'
+
+# Normal colors
+[colors.normal]
+black = '#27272a'
+blue = '#5e7fdd'
+cyan = '#97c3fa'
+green = '#90b99f'
+magenta = '#e29eca'
+red = '#d45d9e'
+white = '#c9c7cd'
+yellow = '#f0ea2d'
+
+# Bright colors
 [colors.bright]
-black = "#949494"
+black = '#353539'
-blue = "#74b2ff"
+blue = '#a7b3dd'
-cyan = "#85dc85"
+cyan = '#6de6fc'
-green = "#36c692"
+green = '#a8fc8d'
-magenta = "#ae81ff"
+magenta = '#eb4cce'
-red = "#ff5189"
+red = '#ca72de'
-white = "#e4e4e4"
+white = '#c9c7cd'
-yellow = "#c6c684"
+yellow = '#f7f48d'
 
 [colors.cursor]
 cursor = "#8e8e8e"
 text = "#080808"
 
-[colors.normal]
-black = "#323437"
-blue = "#80a0ff"
-cyan = "#79dac8"
-green = "#8cc85f"
-magenta = "#cf87e8"
-red = "#ff5454"
-white = "#c6c6c6"
-yellow = "#e3c78a"
-
-[colors.primary]
-background = "#080808"
-bright_foreground = "#eeeeee"
-foreground = "#bdbdbd"
-
 [colors.selection]
 background = "#b2ceee"
 text = "#080808"

config/.config/.mono/keypairs/[1][98f3a7e3-0d6e-f432-8a18-e1144b53633f][-1].xml

@@ -0,0 +1,9 @@
+<KeyPair>
+	<Properties>
+		<Provider Type="1" />
+		<Container Name="98f3a7e3-0d6e-f432-8a18-e1144b53633f" />
+	</Properties>
+	<KeyValue>
+		<RSAKeyValue><Modulus>l97jvAiPd88/KZ5NjMGFg+EaAC9rk50nPVJPlX+cGX6irHt+haXvMJ+b/Lh8JFtSw01cf+TJJwNmO0Hzdv0tF35CmXuOkeJAXVa0JNoGLaXxtdqO2ZxD8Lt8OYj/ueAX/zKiWmet3DP4gT1qTXn/mON+hFB6sZ2f2MLwadm7joCTPPsxZxAluxjk+XGajBFKRp3/u8CYRu5C98K7QUU0RwSBiccFUrUytqBz4Dsn8a1YakwcApmCl+sJF7RW6obf</Modulus><Exponent>AQAB</Exponent><P>sJS6yQDEMEdlmtWW8mPx7ZEEu/Zn8ahkJoAas7AToNNUaunZv+PpDS9K0dQO6sPOG/Dvwgm9AtHYrswUIRI0ts84PNvvt4yJfDXVUOFgnCuv6v71yhbxlRkbWGdBeyB3</P><Q>3C0NJwOEZ1yE8piwHm1n3fEaB5tRBYFyEZ309OjBPmbUiaq1Cx/lV2LzEFrQ0RSNpWhijBk8nObwzoBDi1gkFmen9i5STX5nHQiwUnuCZfhShxOvL/yMD7R8qZ/fRo7Z</Q><DP>hciZX7KR8ZYWV+HdVFX+tKP7t0Dv7bpL7pN+J4eOx3l1au80B9tv9YpQIHuOtbWWEbtQm21vY5SDm6OI2KmHgL2s+QcVLrZub8oFjRrEbG35AY0bwXnynKkB+893YAbv</DP><DQ>ctw5yUmHcBiO7rQC5My0a88UgjVfbhzaciBSItWtwi0I4Yyhh90q2oyvOq/10a0EO+8ZwfaEbWH46/FzyyS/JsUKlV4S54RyrG3U9iKioymJfBgjw0fflW3VvvO9GeT5</DQ><InverseQ>U0UtjaLfCsBcJcSLlZWX9Ziovt9iFjF8JnpN+lk2C8Uz4I4y62xMZmazEf5G/liEsL1SKNFdSWfRyZdzS7e6/tcNhc72bfSCldXRB2mrwfl2YRw3bVdSMoKUBqdpWVs6</InverseQ><D>KttNLLzFr6ueSWJQxA3AXaziJ3c6RleswRM/PhLavB8OTNo0pAZlbzU7UZ/F+ISE4HQuTDEFyqqc6M/9onBjjyOkK6fAXc6ZFz3mbBfScoNHqGfas/HzAjYGIj5U2+EutHDAUhFmfGiiZ1DmwrFcyI5X9Q5foPwXw+uDOUXVU1TtnSzJanvZEaPB90Bvc179gEIXJr26Dbl7ZGGQTGtOUBsFEnMGMh5/tcby8d5PWcFJr1iYDKG1N93xEYrlo7Th</D></RSAKeyValue>
+	</KeyValue>
+</KeyPair>

config/.config/Microsoft\VisualStudio Services/8.0/Cache/LocationServerMap.xml

@@ -0,0 +1,4 @@
+<LocationServerMappings>
+  <ServerMapping location="https://app.vssps.visualstudio.com/" guid="a5ca35eb-148e-4ccd-bbb3-d31576d75958" owner="951917ac-a960-4999-8464-e3f0aa25b381" />
+  <ServerMapping location="https://api.vstsusers.visualstudio.com/" guid="2dba3f49-86e9-f22a-b81f-b604f401cfbe" owner="00000038-0000-8888-8000-000000000000" />
+</LocationServerMappings>

config/.config/gtk-2.0/gtkfilechooser.ini

@@ -0,0 +1,11 @@
+[Filechooser Settings]
+LocationMode=path-bar
+ShowHidden=false
+ShowSizeColumn=true
+GeometryX=540
+GeometryY=351
+GeometryWidth=720
+GeometryHeight=540
+SortColumn=name
+SortOrder=ascending
+StartupMode=recent

config/.config/nvim/after/ftplugin/gdscript.vim

@@ -3,4 +3,4 @@ set nowrap
 set tabstop=4
 set softtabstop=4
 set shiftwidth=4
-set noexpandtab
+set expandtab

config/.config/nvim/init.lua

@@ -1,30 +1,30 @@
 vim.cmd("source " .. vim.env.HOME .. "/.vimrc")
 
+vim.g.maplocalleader = ","
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
+	vim.fn.system({
-    "git",
+		"git",
-    "clone",
+		"clone",
-    "--filter=blob:none",
+		"--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
+		"https://github.com/folke/lazy.nvim.git",
-    lazypath,
+		lazypath,
-  })
+	})
 end
 vim.opt.rtp:prepend(lazypath)
 vim.opt.rtp:prepend(vim.env.HOME .. "/.vim")
-vim.opt.rtp:prepend(vim.env.HOME .. "/.vim/lua")
+local luahome = vim.env.HOME .. "/.vim/lua"
-vim.opt.rtp:prepend(vim.env.HOME .. "/.vim/lua")
+vim.opt.rtp:prepend(luahome)
 
 package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua"
 
-local plugins = {
+for _, file in ipairs(vim.fn.readdir(luahome .. "/config", [[v:val =~ '\.lua$']])) do
-  -- this entry tells lazy.nvim to load the list of of *.lua files from plugins/
+	require("config" .. "." .. file:gsub("%.lua$", ""))
-  { import = "plugins" },
+end
-}
-require("config.clipboard")
-require("config.tmpl")
-require("config.zip")
 
-require("lazy").setup(plugins)
+require("lazy").setup({
+	-- this entry tells lazy.nvim to load the list of of *.lua files from plugins/
+	import = "plugins",
+})
 
 vim.opt.undodir = vim.fn.expand("$HOME") .. "/.undo/"

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

@@ -1,3 +1,133 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
+  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
+  "actions-preview.nvim": { "branch": "master", "commit": "36513ad213855d497b7dd3391a24d1d75d58e36f" },
+  "aerial.nvim": { "branch": "master", "commit": "2e00d1d4248f08dddfceacb8d2996e51e13e00f6" },
+  "ai.nvim": { "branch": "main", "commit": "f042afc07d2815aa7aef9d1d8bd7e6f4f4957296" },
+  "asyncrun.vim": { "branch": "master", "commit": "e17c49c67d1dd847cd1d7d6077a7168816f546cc" },
+  "auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" },
+  "avante-goose.nvim": { "branch": "main", "commit": "124229c61bd4c63839029086f110ce51ae54caa7" },
+  "avante.nvim": { "branch": "main", "commit": "f9aa75459d403d9e963ef2647c9791e0dfc9e5f9" },
+  "bevy_inspector.nvim": { "branch": "master", "commit": "627d172ce0ef65c52e10cdb0c38bd5b301d90b3c" },
+  "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
+  "blink-cmp-avante": { "branch": "master", "commit": "ddefb8de3cb1286ab39e0ccec0f32a45d03391f2" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
+  "ciderlsp-nvim": { "branch": "main", "commit": "9cd409f51cbb25a9813a15dfa84753fe7f26caac" },
+  "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+  "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
+  "cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
+  "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
+  "cmp-nerdfont": { "branch": "main", "commit": "e97482344ebed29093015a18c155057adf5c842b" },
+  "cmp-nvim-ciderlsp": { "branch": "main", "commit": "58faf9323bcbb5358d820d3fa7f5d0b4c0608b62" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
+  "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f94f7ba948e32cd302caba1c2ca3f7c697fb4fcf" },
+  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
+  "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
+  "cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" },
+  "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
+  "conflict-marker.vim": { "branch": "master", "commit": "62742b2ffe7a433988759c67b5c5a22eff74a14b" },
+  "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
+  "copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" },
+  "crates.nvim": { "branch": "main", "commit": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397" },
+  "dashboard-nvim": { "branch": "master", "commit": "591b5b29e2f17b97496ec3179f6ecd08bb8502cc" },
+  "debugprint.nvim": { "branch": "main", "commit": "196d33d4026436f7eddc67136e98515d62259947" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
+  "firenvim": { "branch": "master", "commit": "c4ab7d2aeb145cd93db8660cb134f771722f2b5e" },
+  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "fzf-lua": { "branch": "main", "commit": "b11467c3fbfe48e4a815e4909f5c4e5b413ce6d0" },
+  "fzf.vim": { "branch": "master", "commit": "3cb44a8ba588e1ada409af495bdc6a4d2d37d5da" },
+  "gdrama-syntax.vim": { "branch": "main", "commit": "004eda58d6e3ce3d1b46bbf257bd99784c475a0e" },
+  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
+  "go.nvim": { "branch": "master", "commit": "fbceaf55e18e9e473f289df008d6b508a479fbf8" },
+  "googlepaths.nvim": { "branch": "main", "commit": "53439c17178049096809b4fb963e75440b86ad78" },
+  "grug-far.nvim": { "branch": "main", "commit": "6ff8a205a29db3a9b08e5debe09452b4d6fd6591" },
+  "guihua.lua": { "branch": "master", "commit": "0cc9631914ffcbe3e474e809c610d12a75b660cf" },
+  "headlines.nvim": { "branch": "master", "commit": "bf17c96a836ea27c0a7a2650ba385a7783ed322e" },
+  "hg": { "branch": "main", "commit": "12ee0a788309734f1f312060b9f984a97157acf3" },
+  "hlchunk.nvim": { "branch": "main", "commit": "19bf4090ab8619fffe07b73a4f92348324f35c98" },
+  "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
+  "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
+  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
+  "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" },
+  "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
+  "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
+  "lsp-zero.nvim": { "branch": "v4.x", "commit": "2afa32e732d7b36e80cd5241fbdc4a38e123c4e0" },
+  "lsp_lines.nvim": { "branch": "main", "commit": "3b57922d2d79762e6baedaf9d66d8ba71f822816" },
+  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
+  "luasnip-google.nvim": { "branch": "main", "commit": "86df31e12350c15e207fcbc255d951144bb6d0b5" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
+  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
+  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
+  "mini.notify": { "branch": "main", "commit": "3a06b21dd0b335b95d125eae813276113b5e9ce7" },
+  "mini.pick": { "branch": "main", "commit": "417c273861971b451687e847383e61687463b06e" },
+  "minuet-ai.nvim": { "branch": "main", "commit": "fb1616faaf4af1c6a4ac6952d9e73833206600a5" },
+  "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
+  "neo-tree.nvim": { "branch": "main", "commit": "71bfdeddc90225e281ce34c378dc1b5914f5018d" },
+  "neovim-throttle-debounce": { "branch": "main", "commit": "f6bf97fa0dc704affc8149aeaef5ef0cafa4d10c" },
+  "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
+  "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
+  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
+  "nvim-jdtls": { "branch": "master", "commit": "c23f200fee469a415c77265ca55b496feb646992" },
+  "nvim-lightbulb": { "branch": "master", "commit": "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49" },
+  "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
+  "nvim-lspconfig": { "branch": "master", "commit": "37cc31c64d657feff6f752a1bf15f584d4734eca" },
+  "nvim-luapad": { "branch": "master", "commit": "176686eb616a5ada5dfc748f2b5109194bbe8a71" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
+  "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },
+  "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" },
+  "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" },
+  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "ec1a2431f8872f650a85ed71c24f0715df2e49c2" },
+  "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" },
+  "paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "refactoring.nvim": { "branch": "master", "commit": "2be7ea3f10b7e59658f5abf6dffc50b5d61964d6" },
+  "ron.vim": { "branch": "master", "commit": "f749e543975a82e8dd9a6e7df9600a1c098ae800" },
+  "rustaceanvim": { "branch": "master", "commit": "3f2b7a94b7fa3c0f301dfa9644c94b543000efc2" },
+  "tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
+  "telescope-import.nvim": { "branch": "main", "commit": "6fd69447679a99b463025e7f2f787e8b185dd740" },
+  "telescope-live-grep-args.nvim": { "branch": "master", "commit": "b80ec2c70ec4f32571478b501218c8979fab5201" },
+  "telescope-recent-files": { "branch": "main", "commit": "eb190c0baded1cbfa9d8767c817b054377683163" },
+  "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
+  "telescope_citc": { "branch": "main", "commit": "61df86dc218198a730e27bafd33535dac8539dcf" },
+  "telescope_codesearch": { "branch": "main", "commit": "4c6ad26b1b0a7db6f5de8f0a619a105f93bf63f3" },
+  "telescope_fig": { "branch": "main", "commit": "6ce47b13e7d38584934df5b20f80cbfa825df20a" },
+  "text-case.nvim": { "branch": "main", "commit": "e898cfd46fa6cde0e83abb624a16e67d2ffc6457" },
+  "time-ago.vim": { "branch": "master", "commit": "be978d5c790cfcc41f524205f28783b9937fd0ee" },
+  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
+  "tree-sitter-gdscript": { "branch": "master", "commit": "33d37a577e1e9f473602a63f06f97119aa5cd710" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
+  "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
+  "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
+  "vim-abolish": { "branch": "master", "commit": "dcbfe065297d31823561ba787f51056c147aa682" },
+  "vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" },
+  "vim-better-whitespace": { "branch": "master", "commit": "86a0579b330b133b8181b8e088943e81c26a809e" },
+  "vim-conjoin": { "branch": "master", "commit": "2ea3b8ed994d12bbf255825d973d865621c64860" },
+  "vim-floaterm": { "branch": "master", "commit": "204a01a3868cbe4549640dca857fb3880ee92b17" },
+  "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" },
+  "vim-illuminate": { "branch": "master", "commit": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf" },
+  "vim-imp": { "branch": "main", "commit": "87d5725e065a76d89aa52889ee8804e723d16e14" },
+  "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
+  "vim-matchup": { "branch": "master", "commit": "ea2ff43e09e68b63fc6d9268fc5d82d82d433cb3" },
+  "vim-signify": { "branch": "master", "commit": "8670143f9e12ed1cd3c9b2c54f345cdd9a4baac3" },
+  "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
+  "vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "33afa80db65113561dc53fa732b7f5e53d5ecfd0" },
+  "vim-tmux-syntax": { "branch": "master", "commit": "1b6a6a5beb96fa232c8d35d305f77496b12678a9" },
+  "vimux": { "branch": "master", "commit": "7db6b2f79d432ee3820668b1d4625311dbe1d0ad" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
+  "yankwin.vim": { "branch": "master", "commit": "d3e3bbb0f785115c2f24b44ddf12e9378a1c1266" },
+  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
 }

config/.config/nvim/syntax/markdown.vim

@@ -0,0 +1,11 @@
+" rainbow markdown
+highlight h1 guifg=#50fa7b gui=bold
+highlight _h1 guifg=#50fa7b gui=nocombine
+highlight h2 guifg=#ff79c6 gui=bold
+highlight _h2 guifg=#ff79c6 gui=nocombine
+highlight h3 guifg=#ffb86c gui=bold
+highlight _h3 guifg=#ffb86c gui=nocombine
+highlight h4 guifg=#8be9fd gui=bold
+highlight _h4 guifg=#8be9fd gui=nocombine
+highlight h5 guifg=#f1fa8c gui=bold
+highlight _h5 guifg=#f1fa8c gui=nocombine

config/.config/xbuild/pkgconfig-cache-2.xml

@@ -0,0 +1,112 @@
+<PcFileCache>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono-options.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/expat.pc" lastWriteTime="2022-06-14T12:57:28-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/glade-sharp-2.0.pc" lastWriteTime="2022-06-14T14:25:49-05:00" name="glade-sharp-2.0" version="2.12.45" description="Glade# - Glade .NET Binding" requires="gtk-sharp-2.0" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="glade-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/glade-sharp.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/monodoc.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="monodoc" version="6.12.0" description="Monodoc - Mono Documentation Tools" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="monodoc" version="1.0.0.0" culture="neutral" publicKeyToken="0738eb9f132ed756" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/monodoc/monodoc.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/librsvg-2.0.pc" lastWriteTime="2022-06-14T12:58:20-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-ft.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.mvc3.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="system.web.mvc3" version="3.0.0.0" description="System.Web.Mvc - ASP.NET MVC v3" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="System.Web.Mvc" version="3.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.Mvc/3.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/xsp-2.pc" lastWriteTime="2022-06-14T14:24:43-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gapi-2.0.pc" lastWriteTime="2022-06-14T14:25:45-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gio-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.mvc2.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gio-unix-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/wcf.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-quartz-image.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/pango.pc" lastWriteTime="2022-06-14T12:52:07-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gdk-quartz-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gobject-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/xbuild12.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="xbuild12" version="12.0" description="XBuild/MSBuild 12.0" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="Microsoft.Build.Engine" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.Engine.dll" />
+    <Assembly name="Microsoft.Build.Framework" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.Framework.dll" />
+    <Assembly name="Microsoft.Build.Tasks.v12.0" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.Tasks.v12.0.dll" />
+    <Assembly name="Microsoft.Build.Utilities.v12.0" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.Utilities.v12.0.dll" />
+    <Assembly name="Microsoft.Build" version="12.0.0.0" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/xbuild/12.0/bin/Microsoft.Build.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk+-quartz-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-pdf.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libcroco-0.6.pc" lastWriteTime="2022-06-14T12:57:56-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gdk-pixbuf-2.0.pc" lastWriteTime="2022-06-14T12:52:49-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk-dotnet-2.0.pc" lastWriteTime="2022-06-14T14:25:50-05:00" name="gtk-dotnet-2.0" version="2.12.45" description=".NET Extensions for Gtk" requires="gtk-sharp-2.0" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="gtk-dotnet" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/gtk-dotnet.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono-lineeditor.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.mvc.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/atk.pc" lastWriteTime="2022-06-14T12:52:21-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/glib-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/reactive.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="reactive" version="6.12.0" description="Reactive Extensions" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="System.Reactive.Interfaces" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Interfaces.dll" />
+    <Assembly name="System.Reactive.Core" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Core.dll" />
+    <Assembly name="System.Reactive.Linq" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Linq.dll" />
+    <Assembly name="System.Reactive.PlatformServices" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.PlatformServices.dll" />
+    <Assembly name="System.Reactive.Providers" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Providers.dll" />
+    <Assembly name="System.Reactive.Debugger" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Debugger.dll" />
+    <Assembly name="System.Reactive.Experimental" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Experimental.dll" />
+    <Assembly name="System.Reactive.Runtime.Remoting" version="2.2.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/System.Reactive.Runtime.Remoting.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-fc.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/freetype2.pc" lastWriteTime="2022-06-14T12:46:29-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.extensions_1.0.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/system.web.extensions.design_1.0.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gdk-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/monosgen-2.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk+-unix-print-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libffi.pc" lastWriteTime="2022-06-14T12:48:31-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/pangocairo.pc" lastWriteTime="2022-06-14T12:52:07-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/aspnetwebstack.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="aspnetwebstack" version="6.12.0" description="References Microsoft ASP.NET Web Stack" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="System.Web.Razor" version="2.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.Razor/2.0.0.0__31bf3856ad364e35/System.Web.Razor.dll" />
+    <Assembly name="System.Web.Http" version="4.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.Http/4.0.0.0__31bf3856ad364e35/System.Web.Http.dll" />
+    <Assembly name="System.Web.WebPages" version="2.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.WebPages/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.dll" />
+    <Assembly name="System.Web.WebPages.Razor" version="2.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.WebPages.Razor/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Razor.dll" />
+    <Assembly name="System.Web.WebPages.Deployment" version="2.0.0.0" culture="neutral" publicKeyToken="31bf3856ad364e35" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/System.Web.WebPages.Deployment/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Deployment.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/ige-mac-integration.pc" lastWriteTime="2022-06-14T12:57:43-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono-cairo.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gmodule-export-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/dotnet35.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-png.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libtiff-4.pc" lastWriteTime="2022-06-14T12:45:34-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/glib-sharp-2.0.pc" lastWriteTime="2022-06-14T14:25:46-05:00" name="glib-sharp-2.0" version="2.12.45" description="GLib# - .NET Binding for the glib library." targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="glib-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/glib-sharp.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gthread-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-svg.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk-sharp-2.0.pc" lastWriteTime="2022-06-14T14:25:48-05:00" name="gtk-sharp-2.0" version="2.12.45" description="Gtk# - GNOME .NET Binding" requires="glib-sharp-2.0" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="pango-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/pango-sharp.dll" />
+    <Assembly name="atk-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/atk-sharp.dll" />
+    <Assembly name="gdk-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/gdk-sharp.dll" />
+    <Assembly name="gtk-sharp" version="2.12.0.0" culture="neutral" publicKeyToken="35e10195dab3c99f" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gtk-sharp-2.0/gtk-sharp.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/pixman-1.pc" lastWriteTime="2022-06-14T12:47:09-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gail.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libpng14.pc" lastWriteTime="2022-06-14T12:45:02-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libgdiplus.pc" lastWriteTime="2022-06-14T14:24:25-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-quartz.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/sqlite3.pc" lastWriteTime="2022-06-14T12:57:17-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gmodule-no-export-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-quartz-font.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk-engines-2.pc" lastWriteTime="2022-06-14T12:58:49-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/fontconfig.pc" lastWriteTime="2022-06-14T12:46:46-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libxml-2.0.pc" lastWriteTime="2022-06-14T12:46:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/xsp-4.pc" lastWriteTime="2022-06-14T14:24:43-05:00" name="xsp-4" version="4.6" description="Mono.WebServer2.dll - ASP.NET hosting support classes for .NET 4.0" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="Mono.WebServer2" version="0.4.0.0" culture="neutral" publicKeyToken="0738eb9f132ed756" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/4.5/Mono.WebServer2.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/libglade-2.0.pc" lastWriteTime="2022-06-14T12:57:04-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/mono-2.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cecil.pc" lastWriteTime="2022-06-14T14:13:23-05:00" name="cecil" version="6.12.0" description="Mono Internal Libraries -- Do not use" targetFramework=".NETFramework,Version=v4.0">
+    <Assembly name="Mono.Cecil" version="0.9.5.0" culture="neutral" publicKeyToken="0738eb9f132ed756" file="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/gac/Mono.Cecil/0.9.5.0__0738eb9f132ed756/Mono.Cecil.dll" />
+  </File>
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-ps.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/cairo-script.pc" lastWriteTime="2022-06-14T12:48:13-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gmodule-2.0.pc" lastWriteTime="2022-06-14T12:51:10-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/dotnet.pc" lastWriteTime="2022-06-14T14:13:23-05:00" />
+  <File path="/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/pkgconfig/gtk+-2.0.pc" lastWriteTime="2022-06-14T12:56:30-05:00" />
+</PcFileCache>

config/.config/zsh-abbr/user-abbreviations

@@ -4,5 +4,6 @@ abbr "bq"="blaze query"
 abbr "br"="blaze run"
 abbr "bt"="blaze test"
 abbr "ds_clean"="find ./ -name \".DS_Store\" -depth -exec rm {} \;"
+abbr "gdvim"="nvim --listen /tmp/godot.pipe"
 abbr "mux"="tmuxinator"
 abbr "replace_string"="replace_string --disable_p4 \"%\" \"%\""

config/.ripgreprc

@@ -0,0 +1,9 @@
+# add gdscript type
+--type-add
+gd:*.{gd,gdscript}*
+
+# Search hidden files / directories (e.g. dotfiles) by default
+--hidden
+
+# Because who cares about case!?
+--smart-case

git/.gitconfig

@@ -1,12 +1,12 @@
 [user]
-	name = Christian Nieves
+    name = Christian Nieves
-	email = cnieves@google.com
+    email = cnieves@google.com
 [color]
-	ui = auto
+    ui = auto
 [url "ssh://git@github.com/"]
-	insteadOf = https://github.com/
+    insteadOf = https://github.com/
 [alias]
-    gr = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
+    gr = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''      %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all
     # one-line log
     l = log --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=short
 
@@ -34,18 +34,69 @@
     la = "!git config -l | grep alias | cut -c 7-"
     po = push origin
 [core]
-	autocrlf = false
+    autocrlf = false
-	excludesfile = /Users/christian/.gitignore_global
+    excludesfile = /Users/christian/.gitignore_global
 [icdiff]
-	options = --highlight --line-numbers
+    options = --highlight --line-numbers
 [merge]
     tool = "nvim"
 [mergetool "nvim"]
-	cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
+    cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
-[diff]
-	tool = icdiff
 [filter "lfs"]
-	clean = git-lfs clean -- %f
+    clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
+    smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
+    process = git-lfs filter-process
-	required = true
+    required = true
+
+
+# clearly makes git better
+
+[column]
+    ui = auto
+[branch]
+    sort = -committerdate
+[tag]
+    sort = version:refname
+[init]
+    defaultBranch = main
+[diff]
+    algorithm = histogram
+    colorMoved = plain
+    mnemonicPrefix = true
+    renames = true
+	tool = icdiff
+[push]
+    default = simple
+    autoSetupRemote = true
+    followTags = true
+[fetch]
+    prune = true
+    pruneTags = true
+    all = true
+
+# why the hell not?
+
+[help]
+    autocorrect = prompt
+[commit]
+    verbose = true
+[rerere]
+    enabled = true
+    autoupdate = true
+[core]
+    excludesfile = ~/.gitignore
+[rebase]
+    autoSquash = true
+    autoStash = true
+    updateRefs = true
+
+# a matter of taste (uncomment if you dare)
+
+[core]
+    # fsmonitor = true
+    # untrackedCache = true
+[merge]
+    # (just 'diff3' if git version < 2.3)
+    # conflictstyle = zdiff3
+[pull]
+    # rebase = true

google/.hgrc

@@ -16,15 +16,15 @@ opts.vimdiff = -d
 # opts.vimdiff = -c ':call ShowMercurialDiff(argv(0), argv(1))'
 
 [extensions]
-unsupported.tree =
+# unsupported.tree =
-unsupported.alices =
+# unsupported.alices =
 extdiff =
-color =
+# color =
 beautifygraph =
 
-[alices]
+# [alices]
-findings.extra_args = --proxy
+# findings.extra_args = --proxy
-summarize.extra_args = --proxy
+# summarize.extra_args = --proxy
 
 [merge-tools]
 vimdiff.executable = nvim
@@ -51,6 +51,7 @@ dt = icdiff --pager=on
 dtex = dt -r exported(.)
 dtp4 = dt -r p4base
 dtup = dt -r .^
+ra = revert --all
 
 whatsout = status -n --change . --template=hgshort_status
 what = status -n --change . --template=hgshort_status

tmux/.tmux.conf

@@ -88,6 +88,8 @@ bind-key s split-window -v -c '#{pane_current_path}'
 
 bind -n M-s set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}"
 
+# bind -n C-Space select-pane -D \; resize-pane -Z
+
 bind -n M-z resize-pane -Z
 
 bind -n M-j resize-pane -D 5
@@ -122,7 +124,7 @@ bind-key C-a set-option -g prefix C-a
 # No delay for escape key press
 set -sg escape-time 0
 
-set -g status-right '#{prefix_highlight} | %a %Y-%m-%d %H:%M'
+run ~/.tmux/plugins/tmux/catppuccin.tmux
 
 # text for the window when inactive
 set -g @catppuccin_window_default_fill "number"
@@ -131,30 +133,27 @@ set -g @catppuccin_window_default_text '#{?#{m/r:^(/google/src)?/cloud/,#{pane_c
 set -g @catppuccin_window_current_fill "number"
 set -g @catppuccin_window_current_text '#{?#{m/r:^(/google/src)?/cloud/,#{pane_current_path}},#{s|^(/google/src)?/cloud/[^/]+/([^/]+).+$|\2|:pane_current_path},#{b:pane_current_path}}'
 
-set -g @catppuccin_pane_status_enabled "yes"
-set -g @catppuccin_pane_border_status "top"
-set -g @catppuccin_pane_left_separator ""
-set -g @catppuccin_pane_right_separator ""
-set -g @catppuccin_pane_middle_separator "█ "
-set -g @catppuccin_pane_number_position "left"
-set -g @catppuccin_pane_default_fill "number"
-
-set -g @catppuccin_status_modules_right "host cpu weather date_time"
-set -g @catppuccin_status_left_separator  ""
-set -g @catppuccin_status_right_separator " "
-set -g @catppuccin_status_right_separator_inverse "yes"
-set -g @catppuccin_status_fill "all"
-set -g @catppuccin_status_connect_separator "no"
-set -g @catppuccin_window_status_icon_enable "yes"
-
-set -g @catppuccin_icon_window_last "󰖰"
-set -g @catppuccin_icon_window_current "󰖯"
-set -g @catppuccin_icon_window_zoom "󰁌"
-set -g @catppuccin_icon_window_mark "󰃀"
-set -g @catppuccin_icon_window_silent "󰂛"
-set -g @catppuccin_icon_window_activity "󰖲"
 set -g @catppuccin_icon_window_bell "󰂞"
 
+# Make the status line pretty and add some modules
+
+set -g status-right-length 100
+
+set -g status-left-length 100
+
+set -g status-left ""
+
+set -g status-right "#{E:@catppuccin_status_application}"
+
+set -agF status-right "#{E:@catppuccin_status_cpu}"
+
+set -ag status-right "#{E:@catppuccin_status_session}"
+
+set -ag status-right "#{E:@catppuccin_status_uptime}"
+
+set -agF status-right "#{E:@catppuccin_status_battery}"
+
+
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
@@ -168,6 +167,7 @@ set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
+set -g @plugin 'catppuccin/tmux#v2.1.2'
 
 set -g @continuum-restore 'on'
 set -g @resurrect-dir '$HOME/.tmux/resurrect'

vim/.vim/lua/config/clipboard.lua

@@ -1,18 +1,33 @@
 local map = require("utils").map
 
-if vim.env.SSH_TTY or vim.env.SSH_CLIENT or vim.env.SSH_CONNECTION then
+if vim.fn.hostname() == "goblin" then
 	vim.g.clipboard = {
-		name = "lemonade",
+		name = "wayland",
 		copy = {
-			["+"] = { "lemonade", "copy" },
+			["+"] = { "wl-copy" },
-			["*"] = { "lemonade", "copy" },
+			["*"] = { "wl-copy" },
 		},
 		paste = {
-			["+"] = { "lemonade", "paste" },
+			["+"] = { "wl-paste" },
-			["*"] = { "lemonade", "paste" },
+			["*"] = { "wl-paste" },
 		},
 		cache_enabled = false,
 	}
+else
+  if vim.env.SSH_TTY or vim.env.SSH_CLIENT or vim.env.SSH_CONNECTION then
+	  vim.g.clipboard = {
+		  name = "lemonade",
+		  copy = {
+			  ["+"] = { "lemonade", "copy" },
+			  ["*"] = { "lemonade", "copy" },
+		  },
+		  paste = {
+			  ["+"] = { "lemonade", "paste" },
+			  ["*"] = { "lemonade", "paste" },
+		  },
+		  cache_enabled = false,
+	  }
+  end
 end
 
 map("v", "<leader>y", '"+y')

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

@@ -1,77 +0,0 @@
-local use_google = require("utils").use_google
-local M = {}
-
-function M.setup(capabilities)
-	if use_google() then
-		local lspconfig = require("lspconfig")
-		local configs = require("lspconfig.configs")
-		configs.ciderlsp = {
-			default_config = {
-				offset_encoding = "utf-16",
-				cmd = {
-					"/google/bin/releases/cider/ciderlsp/ciderlsp",
-					"--tooltag=nvim-lsp",
-					"--forward_sync_responses",
-					-- "--debug_relay",
-				},
-				filetypes = {
-					"c",
-					"cpp",
-					"java",
-					"kotlin",
-					"objc",
-					"proto",
-					"textproto",
-					"go",
-					"python",
-					"bzl",
-					"typescript",
-				},
-				root_dir = require("lspconfig").util.root_pattern(".citc"),
-				settings = {},
-			},
-		}
-
-		local my_on_attach = function(client, bufnr)
-			require("lualine").refresh()
-			vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc")
-			if vim.lsp.formatexpr then -- Neovim v0.6.0+ only.
-				vim.api.nvim_buf_set_option(bufnr, "formatexpr", "v:lua.vim.lsp.formatexpr")
-			end
-			if vim.lsp.tagfunc then
-				vim.api.nvim_buf_set_option(bufnr, "tagfunc", "v:lua.vim.lsp.tagfunc")
-			end
-
-			local lsp_status = require("lsp-status")
-			lsp_status.on_attach(client)
-		end
-
-		local cider_on_attach = function(client, bufnr)
-			my_on_attach(client, bufnr)
-			vim.b["is_cider_lsp_attached"] = "no"
-		end
-
-		local cider_lsp_handlers = {
-			["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
-				focusable = false,
-			}),
-		}
-
-		cider_lsp_handlers["$/syncResponse"] = function(_, result, ctx)
-			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")
-				require("lualine").refresh()
-			end
-		end
-
-		lspconfig.ciderlsp.setup({
-			capabilities = capabilities,
-			on_attach = cider_on_attach,
-			handlers = cider_lsp_handlers,
-		})
-	end
-end
-
-return M

vim/.vim/lua/config/wgsl.lua

@@ -0,0 +1,9 @@
+vim.api.nvim_create_autocmd({ "BufNewFile", "BufRead" }, {
+	pattern = "*.wgsl",
+	callback = function()
+		local lspconfig = require("lspconfig")
+		lspconfig.wgsl_analyzer.setup({})
+
+		vim.bo.filetype = "wgsl"
+	end,
+})

vim/.vim/lua/plugins/avante.lua

@@ -0,0 +1,61 @@
+local use_google = require("utils").use_google
+
+return {
+	{
+		"vintharas/avante-goose.nvim",
+		url = "sso://user/vintharas/avante-goose.nvim",
+		opts = {},
+		cond = use_google(),
+	},
+	{
+		"yetone/avante.nvim",
+		event = "VeryLazy",
+		version = false, -- Never set this value to "*"! Never!
+		opts = {
+			-- add any opts here
+			-- for example
+			openai = {
+				endpoint = "https://api.openai.com/v1",
+				model = "gpt-4o", -- your desired model (or use gpt-4o, etc.)
+				timeout = 30000, -- Timeout in milliseconds, increase this for reasoning models
+				temperature = 0,
+				max_completion_tokens = 8192, -- Increase this to include reasoning tokens (for reasoning models)
+				--reasoning_effort = "medium", -- low|medium|high, only used for reasoning models
+			},
+			vendors = {}, -- Makes sure there's a vendors table
+		},
+		config = function(_, opts)
+			-- Load provider from the plugin
+			opts.vendors["goose"] = require("avante-goose").getProvider({
+				-- Add your options here
+				model = "goose-v3.5-s", -- go/goose-models
+				temperature = 0.1,
+			})
+
+				if use_google() then
+					opts.provider = "goose"
+				else
+					opts.provider = "openai"
+				end
+			require("avante").setup(opts)
+		end,
+		-- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
+		build = "make",
+		-- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows
+		dependencies = {
+			"nvim-treesitter/nvim-treesitter",
+			-- "vintharas/avante-goose.nvim",
+			"stevearc/dressing.nvim",
+			"Kaiser-Yang/blink-cmp-avante",
+			"nvim-lua/plenary.nvim",
+			"MunifTanjim/nui.nvim",
+			--- The below dependencies are optional,
+			"echasnovski/mini.pick", -- for file_selector provider mini.pick
+			"nvim-telescope/telescope.nvim", -- for file_selector provider telescope
+			"hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
+			"ibhagwan/fzf-lua", -- for file_selector provider fzf
+			"nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons
+			"zbirenbaum/copilot.lua", -- for providers='copilot'
+		},
+	},
+}

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

@@ -1,175 +1,156 @@
 local use_google = require("utils").use_google
 
 return {
-	"sindrets/diffview.nvim",
+    {
-	--{ "mizlan/iswap.nvim", event = "VeryLazy" },
+    "folke/flash.nvim",
-	{ "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
+    event = "VeryLazy",
-	{
+    ---@type Flash.Config
-		"folke/flash.nvim",
+    opts = {},
-		event = "VeryLazy",
-		---@type Flash.Config
-		opts = {
-			jump = {
-				nohlsearch = true,
-			},
-		},
     -- stylua: ignore
     keys = {
-      { "s",     mode = { "n", "x", "o" }, function() require("flash").jump() end,              desc = "Flash" },
+      { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-      { "S",     mode = { "n", "x", "o" }, function() require("flash").treesitter() end,        desc = "Flash Treesitter" },
+      { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
-      { "r",     mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
+      { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
-      { "R",     mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+      { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-      { "<c-s>", mode = { "c" },           function() require("flash").toggle() end,            desc = "Toggle Flash Search" },
+      { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
     },
-	},
+  },
-	{
+  "tikhomirov/vim-glsl",
-		"MagicDuck/grug-far.nvim",
+  "sindrets/diffview.nvim",
-		config = function()
+  { "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
-			require("grug-far").setup({
+  {
-				-- search and replace engines configuration
+    "MagicDuck/grug-far.nvim",
-				engines = {
+    config = function()
-					-- see https://github.com/BurntSushi/ripgrep
+      require("grug-far").setup({
-					ripgrep = {
+        -- search and replace engines configuration
-						-- ripgrep executable to use, can be a different path if you need to configure
+        engines = {
-						path = "rg",
+          -- see https://github.com/BurntSushi/ripgrep
-						extraArgs = "--.",
+          ripgrep = {
-					},
+            -- ripgrep executable to use, can be a different path if you need to configure
-				},
+            path = "rg",
-			})
+            -- extraArgs = "-.",
-		end,
+          },
-	},
+        },
-
+      })
-	{
+    end,
-		"shellRaining/hlchunk.nvim",
+  },
-		event = { "BufReadPre", "BufNewFile" },
+  {
-		opts = {
+    "shellRaining/hlchunk.nvim",
-			line_num = { enable = true },
+    event = { "BufReadPre", "BufNewFile" },
-			chunk = {
+    opts = {
-				enable = true,
+      line_num = { enable = true },
-				priority = 15,
+      chunk = {
-				style = {
+        enable = true,
-					{ fg = "#393d4c" },
+        priority = 15,
-				},
+        style = {
-				chars = {
+          { fg = "#393d4c" },
-					horizontal_line = "─",
+        },
-					-- vertical_line = "│",
+        chars = {
-					vertical_line = "┊",
+          horizontal_line = "─",
-					left_top = "╭",
+          -- vertical_line = "│",
-					left_bottom = "╰",
+          vertical_line = "┊",
-					right_arrow = ">",
+          left_top = "╭",
-				},
+          left_bottom = "╰",
-				use_treesitter = true,
+          right_arrow = ">",
-				textobject = "",
+        },
-				max_file_size = 1024 * 1024,
+        use_treesitter = true,
-				error_sign = true,
+        textobject = "",
-				-- animation related
+        max_file_size = 1024 * 1024,
-				duration = 0,
+        error_sign = true,
-				delay = 0,
+        -- animation related
-			},
+        duration = 0,
-		},
+        delay = 0,
-	},
+      },
-	{
-		"Bekaboo/dropbar.nvim",
-		-- optional, but required for fuzzy finder support
-		dependencies = {
-			"nvim-telescope/telescope-fzf-native.nvim",
-		},
-		config = function()
-			vim.ui.select = require("dropbar.utils.menu").select
-		end,
-	},
-	"RRethy/vim-illuminate",
-	"kdheepak/lazygit.nvim",
-	"flwyd/vim-conjoin",
-	"rafcamlet/nvim-luapad",
-	"vim-scripts/vcscommand.vim",
-	"AndrewRadev/tagalong.vim",
-	"AndrewRadev/yankwin.vim",
-	{ "squk/gdrama-syntax.vim", ft = "gdrama" },
-	{ "nvim-lua/plenary.nvim", lazy = false },
-	{ "squk/java-syntax.vim", ft = "java" },
-	{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
-	-- { "andymass/vim-matchup", event = "VimEnter" },
-	{ "jghauser/mkdir.nvim", event = "BufWritePre" },
-	{
-		"rmagatti/auto-session",
-		dependencies = {
-			"nvim-telescope/telescope.nvim", -- Only needed if you want to use session lens
-		},
-		config = function()
-			require("auto-session").setup({
-				auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
-				args_allow_single_directory = false,
-				bypass_save_filetypes = { "netrw" },
-			})
-		end,
-	},
-	"tpope/vim-abolish",
-	{
-		"johmsalas/text-case.nvim",
-		dependencies = { "nvim-telescope/telescope.nvim" },
-		config = function()
-			require("textcase").setup({})
-			require("telescope").load_extension("textcase")
-		end,
-		cmd = {
-			"Subs",
-		},
-    -- stylua: ignore
-    keys = {
-      { "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
     },
-	},
+  },
-	{
+  "RRethy/vim-illuminate",
-		"NvChad/nvim-colorizer.lua",
+  "kdheepak/lazygit.nvim",
-		ft = "lua",
+  "flwyd/vim-conjoin",
-		config = function()
+  "rafcamlet/nvim-luapad",
-			require("colorizer").setup()
+  "vim-scripts/vcscommand.vim",
-		end,
+  "AndrewRadev/tagalong.vim",
-	},
+  "AndrewRadev/yankwin.vim",
-	{
+  { "squk/gdrama-syntax.vim",   ft = "gdrama" },
+  { "nvim-lua/plenary.nvim",    lazy = false },
+  { "squk/java-syntax.vim",     ft = "java" },
+  { "udalov/kotlin-vim",        event = "VeryLazy",                        ft = "kotlin" },
+  { "andymass/vim-matchup",     event = "VimEnter" },
+  { "jghauser/mkdir.nvim",      event = "BufWritePre" },
+  {
+    "rmagatti/auto-session",
+    dependencies = {
+      "nvim-telescope/telescope.nvim", -- Only needed if you want to use session lens
+    },
+    config = function()
+      require("auto-session").setup({
+        auto_session_suppress_dirs = { "~/", "~/Projects", "~/Downloads", "/" },
+        args_allow_single_directory = false,
+        bypass_save_filetypes = { "netrw" },
+      })
+    end,
+  },
+  "tpope/vim-abolish",
+  {
+    "johmsalas/text-case.nvim",
+    dependencies = { "nvim-telescope/telescope.nvim" },
+    config = function()
+      require("textcase").setup({})
+      require("telescope").load_extension("textcase")
+    end,
+    cmd = {
+      "Subs",
+    },
+  },
+  {
+    "NvChad/nvim-colorizer.lua",
+    ft = "lua",
+    config = function()
+      require("colorizer").setup()
+    end,
+  },
+  {
 
-		"andweeb/presence.nvim",
+    "andweeb/presence.nvim",
-		cond = not use_google(),
+    cond = not use_google(),
-		config = function()
+    config = function()
-			require("presence").setup({
+      require("presence").setup({
-				main_image = "file",
+        main_image = "file",
-				show_time = false,
+        show_time = false,
-			})
+      })
-		end,
+    end,
-	},
+  },
-	{
+  {
-		"ntpeters/vim-better-whitespace",
+    "ntpeters/vim-better-whitespace",
-		config = function()
+    config = function()
-			vim.g.better_whitespace_filetypes_blacklist = { "dashboard" }
+      vim.g.better_whitespace_filetypes_blacklist = { "dashboard" }
-		end,
+    end,
-	},
+  },
-	{
+  {
-		"mbbill/undotree",
+    "mbbill/undotree",
-		cmd = "UndotreeToggle",
+    cmd = "UndotreeToggle",
-		config = function()
+    config = function()
-			vim.g.undotree_SetFocusWhenToggle = 1
+      vim.g.undotree_SetFocusWhenToggle = 1
-		end,
+    end,
     -- stylua: ignore
     keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
-	},
+  },
-	{
+  {
-		"stevearc/aerial.nvim",
+    "stevearc/aerial.nvim",
-		opts = {},
+    opts = {},
-		cmd = { "AerialToggle", "AerialOn" },
+    cmd = { "AerialToggle", "AerialOn" },
     -- stylua: ignore
     keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
-	},
+  },
-	{
+  {
-		"andrewferrier/debugprint.nvim",
+    "andrewferrier/debugprint.nvim",
-		opts = {},
+    opts = {},
-		-- Dependency only needed for NeoVim 0.8
+    -- Dependency only needed for NeoVim 0.8
-		dependencies = {
+    dependencies = {
-			"nvim-treesitter/nvim-treesitter",
+      "nvim-treesitter/nvim-treesitter",
-		},
+    },
-		-- Remove the following line to use development versions,
+    -- Remove the following line to use development versions,
-		-- not just the formal releases
+    -- not just the formal releases
-		version = "*",
+    version = "*",
     -- stylua: ignore
     keys = {
       { "<leader>dp", ":lua require('debugprint').debugprint()<cr>",                                desc = "Debug print" },
@@ -177,5 +158,5 @@ return {
       { "<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", },
     },
-	},
+  },
 }

vim/.vim/lua/plugins/bevy.lua

@@ -0,0 +1,17 @@
+return {
+	"lommix/bevy_inspector.nvim",
+	dependencies = {
+		"nvim-telescope/telescope.nvim",
+		"nvim-lua/plenary.nvim",
+	},
+	config = function()
+		require("bevy_inspector").setup({})
+	end,
+	cmd = { "BevyInspect", "BevyInspectNamed", "BevyInspectQuery" },
+    -- stylua: ignore
+		keys = {
+			{  "<leader>bia", ":BevyInspect<Cr>", desc = "Lists all entities" },
+			{  "<leader>bin", ":BevyInspectNamed<Cr>", desc = "List all named entities" },
+			{  "<leader>biq", ":BevyInspectQuery<Cr>", desc = "Query a single component, continues to list all matching entities", },
+		},
+}

vim/.vim/lua/plugins/bigfile.lua

@@ -1,17 +1,30 @@
 return {
   "LunarVim/bigfile.nvim",
   opts = {
-    filesize = 2,      -- size of the file in MiB, the plugin round file sizes to the closest MiB
+    filesize = 2, -- size of the file in MiB, the plugin round file sizes to the closest MiB
-    pattern = { "*" }, -- autocmd pattern or function see <### Overriding the detection of big files>
+    pattern = function(bufnr, filesize_mib)
-    features = {       -- features to disable
+      -- you can't use `nvim_buf_line_count` because this runs on BufReadPre
+      local file_contents = vim.fn.readfile(vim.api.nvim_buf_get_name(bufnr))
+      local file_lines = #file_contents
+      local filetype = vim.filetype.match({ buf = bufnr })
+      if filetype == "c" or filetype == "cpp" then
+        if file_lines > 1000 then
+          vim.b.codefmt_formatt = "" -- disable codefmt
+          vim.cmd(":FormatDisable") -- disable conform
+          return true
+        end
+      end
+      return filesize_mib > 1
+    end,
+    features = { -- features to disable
       "indent_blankline",
       "illuminate",
       "lsp",
       "treesitter",
-      "syntax",
+      -- "syntax",
       "matchparen",
-      "vimopts",
+      -- "vimopts",
-      "filetype",
+      -- "filetype",
     },
   }
 }

vim/.vim/lua/plugins/blink.lua

@@ -1,5 +1,18 @@
 local use_google = require("utils").use_google
 local flags = require("utils").flags
+local kind_icons = {
+	-- LLM Provider icons
+	claude = "󰋦",
+	openai = "󱢆",
+	codestral = "󱎥",
+	gemini = "",
+	nvim_ciderlsp = "󱜚",
+	Groq = "",
+	Openrouter = "󱂇",
+	Ollama = "󰳆",
+	["Llama.cpp"] = "󰳆",
+	Deepseek = "",
+}
 
 return {
 	{
@@ -8,22 +21,24 @@ return {
 		version = "*",
 		-- lazy.nvim will automatically load the plugin when it's required by blink.cmp
 		lazy = true,
-		-- make sure to set opts so that lazy.nvim calls blink.compat's setup
-		opts = {},
 		cond = flags.blink,
+		-- make sure to set opts so that lazy.nvim calls blink.compat's setup
+		opts = {
+			impersonate_nvim_cmp = true,
+			debug = true,
+		},
 	},
 	{
 		"saghen/blink.cmp",
 		lazy = false, -- lazy loading handled internally
 		cond = flags.blink,
 		dependencies = {
-			"Exafunction/codeium.nvim",
-			"mikavilpas/blink-ripgrep.nvim",
-			"hrsh7th/cmp-cmdline",
-			-- "FelipeLema/cmp-async-path",
 			"chrisgrieser/cmp-nerdfont",
-			"hrsh7th/cmp-emoji",
+			"hrsh7th/cmp-nvim-lsp",
+			"mikavilpas/blink-ripgrep.nvim",
+			"moyiz/blink-emoji.nvim",
 			"rafamadriz/friendly-snippets", -- optional: provides snippets for the snippet source
+			"saghen/blink.compat",
 		},
 		version = "v0.*", -- use a release tag to download pre-built binaries
 		-- build = 'cargo build --release',
@@ -31,83 +46,133 @@ return {
 		---@module 'blink.cmp'
 		---@type blink.cmp.Config
 		opts = {
-			keymap = {
+      -- stylua: ignore
-				["<C-space>"] = { "show", "show_documentation", "hide_documentation" },
+      keymap = {
-				["<C-e>"] = { "hide", "fallback" },
+        preset = "none",
-				["<CR>"] = { "accept", "fallback" },
+        ["<C-space>"] = { "show", "show_documentation", "hide_documentation" },
+        ["<C-e>"] = { "hide", "fallback" },
+        ["<CR>"] = { "accept", "fallback" },
 
-				["<Tab>"] = { "select_next", "snippet_forward", "accept", "fallback" },
+        ["<Tab>"] = { "select_next", "snippet_forward", "accept", "fallback" },
-				["<S-Tab>"] = { "select_prev", "snippet_backward", "fallback" },
+        ["<S-Tab>"] = { "select_prev", "snippet_backward", "fallback" },
 
-				["<Up>"] = { "select_prev", "fallback" },
+        ["<Up>"] = { "select_prev", "fallback" },
-				["<Down>"] = { "select_next", "fallback" },
+        ["<Down>"] = { "select_next", "fallback" },
 
-				["<S-Up>"] = { "scroll_documentation_up", "fallback" },
+        ["<S-Up>"] = { "scroll_documentation_up", "fallback" },
-				["<S-Down>"] = { "scroll_documentation_down", "fallback" },
+        ["<S-Down>"] = { "scroll_documentation_down", "fallback" },
+      },
+			appearance = {
+				use_nvim_cmp_as_default = true,
+				nerd_font_variant = "normal",
+				kind_icons = kind_icons,
 			},
 			sources = {
 				default = function(ctx)
 					local providerToEnable = {
 						"lsp",
 						"path",
-						"crates",
 						"snippets",
 						"ripgrep",
 						"emoji",
 						"nerdfont",
 						"buffer",
+						"avante",
 					}
-					print(vim.inspect(providerToEnable))
 					if use_google() then
 						table.insert(providerToEnable, "nvim_ciderlsp")
 						table.insert(providerToEnable, "buganizer")
+						-- table.insert(providerToEnable, "avante")
 					else
-						table.insert(providerToEnable, "codeium")
+						-- table.insert(providerToEnable, "avante")
+						table.insert(providerToEnable, "minuet")
 					end
 					return providerToEnable
 				end,
-			},
+				providers = {
-			providers = {
+					lsp = { name = "LSP", module = "blink.cmp.sources.lsp", score_offset = 90 },
-				-- dont show LuaLS require statements when lazydev has items
+					-- dont show LuaLS require statements when lazydev has items
-				lsp = { fallback_for = { "lazydev" } },
+					lazydev = { name = "LazyDev", module = "lazydev.integrations.blink", fallbacks = { "lsp" } },
-				lazydev = { name = "LazyDev", module = "lazydev.integrations.blink" },
+					ripgrep = {
-				ripgrep = {
+						module = "blink-ripgrep",
-					module = "blink-ripgrep",
+						name = "Ripgrep",
-					name = "Ripgrep",
+						-- the options below are optional, some default values are shown
-					-- the options below are optional, some default values are shown
+						---@module "blink-ripgrep"
-					---@module "blink-ripgrep"
+						---@type blink-ripgrep.Options
-					---@type blink-ripgrep.Options
+						opts = {
-					opts = {
+							prefix_min_len = 3,
-						prefix_min_len = 3,
+							context_size = 5,
-						context_size = 5,
+							max_filesize = "1M",
-						max_filesize = "1M",
+							additional_rg_options = {},
-						additional_rg_options = {},
+						},
+						score_offset = 20, -- the higher the number, the higher the priority
+					},
+					-- https://github.com/moyiz/blink-emoji.nvim
+					emoji = {
+						module = "blink-emoji",
+						name = "Emoji",
+						score_offset = 1, -- the higher the number, the higher the priority
+						opts = { insert = true }, -- Insert emoji (default) or complete its name
+					},
+					buffer = {
+						name = "Buffer",
+						enabled = true,
+						max_items = 3,
+						module = "blink.cmp.sources.buffer",
+						min_keyword_length = 4,
+						score_offset = 15, -- the higher the number, the higher the priority
+					},
+					-- compat sources
+					nerdfont = {
+						name = "nerdfont",
+						module = "blink.compat.source",
+						score_offset = 1, -- the higher the number, the higher the priority
+					},
+					minuet = {
+						name = "minuet",
+						module = "minuet.blink",
+						score_offset = 100, -- Gives minuet higher priority among suggestions
+					},
+					-- avante = {
+					-- 	module = "blink-cmp-avante",
+					-- 	name = "Avante",
+					-- 	opts = {
+					-- 		-- options for blink-cmp-avante
+					-- 	},
+					-- },
+					nvim_ciderlsp = {
+						name = "nvim_ciderlsp",
+						module = "blink.compat.source",
+						score_offset = 100,
+					},
+					buganizer = {
+						name = "nvim_buganizer",
+						module = "blink.compat.source",
 					},
-				},
-				nvim_ciderlsp = {
-					name = "nvim_ciderlsp",
-					module = "blink.compat.source",
-				},
-				buganizer = {
-					name = "nvim_buganizer",
-					module = "blink.compat.source",
-				},
-				codeium = {
-					name = "codeium",
-					module = "blink.compat.source",
 				},
 			},
 			-- experimental signature help support
 			signature = { enabled = true },
 			completion = {
+				-- Recommended to avoid unnecessary request
+				trigger = { prefetch_on_insert = false },
+				list = {
+          -- stylua: ignore
+          selection = {
+            preselect = function(ctx) return ctx.mode ~= 'cmdline' end,
+            auto_insert = function(ctx) return ctx.mode ~= 'cmdline' end,
+          },
+				},
+				documentation = {
+					auto_show = true,
+				},
+				-- Displays a preview of the selected item on the current line
+				ghost_text = {
+					enabled = true,
+				},
 				trigger = {
 					show_on_x_blocked_trigger_characters = { "'", '"', "(", "{" },
 				},
-				menu = {
-					draw = {
-						-- columns = { { "label", "label_description", gap = 1 }, { "kind_icon", "kind" } },
-					},
-				},
 			},
 		},
 

vim/.vim/lua/plugins/bufferline.lua

@@ -2,41 +2,29 @@ return {
 	{
 		"akinsho/bufferline.nvim",
 		version = "*",
-		dependencies = "nvim-tree/nvim-web-devicons",
+		dependencies = { "nvim-tree/nvim-web-devicons" },
-		config = function()
+		opts = {
-			vim.opt.termguicolors = true
+			options = {
-			require("bufferline").setup({
+				separator_style = "slope",
-				options = {
+				-- offsets = { {
-					hover = {
+				--   filetype = "neo-tree",
-						enabled = true,
+				--   text = "NeoTree",
-						delay = 200,
+				--   highlight = "Directory",
-						reveal = { "close" },
+				--   separator = true, -- use a "true" to enable the default, or set your own character
-					},
+				-- }, },
-					indicator = {
+				mode = "tabs",
-						-- icon = "▎", -- this should be omitted if indicator style is not 'icon'
+				diagnostics = "nvim_lsp",
-						style = "icon", -- | 'underline' | 'none',
+				-- diagnostics_indicator = function(count, level, diagnostics_dict, context)
-					},
+				--   local symbols = { error = " ", warning = " ", info = " ", hint = "󱠂 " }
-					offsets = {
+				--   local icon = symbols[level] or level
-						{
+				--   return "" .. icon .. count
-							filetype = "NvimTree",
+				-- end,
-							text = "File Explorer",
+				max_name_length = 30,
-							highlight = "Directory",
+				tab_size = 27,
-							separator = true, -- use a "true" to enable the default, or set your own character
+				truncate_name = false,
-						},
+				show_close_icon = false,
-					},
+				show_buffer_close_icons = false,
-					mode = "tabs",
+			},
-					diagnostics = "nvim_lsp",
+		},
-					diagnostics_indicator = function(count, level, diagnostics_dict, context)
-						local symbols = { error = " ", warning = " ", info = " ", hint = "󱠂 " }
-						local icon = symbols[level] or level
-						return "" .. icon .. count
-					end,
-					max_name_length = 30,
-					truncate_name = false,
-					show_close_icon = false,
-					show_buffer_close_icons = false,
-				},
-			})
-		end,
 	},
 }

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

@@ -7,7 +7,6 @@ return {
 		event = { "InsertEnter", "CmdlineEnter" },
 		cond = not flags.blink,
 		dependencies = {
-			"Exafunction/codeium.nvim",
 			"FelipeLema/cmp-async-path",
 			"amarakon/nvim-cmp-buffer-lines",
 			"chrisgrieser/cmp-nerdfont",
@@ -39,8 +38,6 @@ return {
 			if use_google() then
 				table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 8 })
 				table.insert(conditionalSources, { name = "buganizer", option = { notifications_enabled = true } })
-			else
-				table.insert(conditionalSources, { name = "codeium", priority = 8 })
 			end
 
 			local lspkind = require("lspkind")
@@ -117,7 +114,6 @@ return {
 							async_path = " path",
 							buffer = " Buf",
 							cmdline = " cmd",
-							codeium = "󰚩 Codeium",
 							crates = " rust",
 							luasnip = " snip",
 							buganizer = " Buganizer",

vim/.vim/lua/plugins/codeium.lua

@@ -1,17 +0,0 @@
-local use_google = require("utils").use_google
-return {
-	{
-		"Exafunction/codeium.nvim",
-		-- commit = "b1ff0d6c993e3d87a4362d2ccd6c660f7444599f",
-		event = "VeryLazy",
-		-- event = "InsertEnter",
-		cond = not use_google(),
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-			"hrsh7th/nvim-cmp",
-		},
-		config = function()
-			require("codeium").setup({})
-		end,
-	},
-}

vim/.vim/lua/plugins/conform.lua

@@ -1,35 +1,5 @@
 local use_google = require("utils").use_google
 
-vim.g.disable_autoformat = false
-vim.api.nvim_create_user_command("FormatDisable", function(args)
-  if args.bang then
-    -- FormatDisable! will disable formatting just for this buffer
-    vim.b.disable_autoformat = true
-  else
-    vim.g.disable_autoformat = true
-  end
-end, {
-  desc = "Disable autoformat-on-save",
-  bang = true,
-})
-
-vim.api.nvim_create_user_command("FormatEnable", function()
-  vim.b.disable_autoformat = false
-  vim.g.disable_autoformat = false
-end, {
-  desc = "Re-enable autoformat-on-save",
-})
-
-vim.api.nvim_create_autocmd("BufWritePre", {
-  pattern = "*",
-  callback = function(args)
-    if vim.g.disable_autoformat or vim.b[args.buf].disable_autoformat then
-      return
-    end
-    require("conform").format({ bufnr = args.buf })
-  end,
-})
-
 return {
   {
     "stevearc/conform.nvim",
@@ -38,40 +8,82 @@ return {
     keys = {
       -- stylua: ignore
       { "<leader>fmt", function() require("conform").format({ async = true, lsp_fallback = true }) end, mode = "", desc = "Format buffer", },
+      { "<leader>fj",  ":%!python -m json.tool" },
     },
-    -- This will provide type hinting with LuaLS
+    config = function()
-    ---@module "conform"
+      vim.g.disable_autoformat = false
-    ---@type conform.setupOpts
+      vim.api.nvim_create_user_command("FormatDisable", function(args)
-    opts = {
+        if args.bang then
+          -- FormatDisable! will disable formatting just for this buffer
+          vim.b.disable_autoformat = true
+        else
+          vim.g.disable_autoformat = true
+        end
+      end, {
+        desc = "Disable autoformat-on-save",
+        bang = true,
+      })
+      vim.api.nvim_create_user_command("FormatEnable", function()
+        vim.b.disable_autoformat = false
+        vim.g.disable_autoformat = false
+      end, {
+        desc = "Re-enable autoformat-on-save",
+      })
+
+      vim.api.nvim_create_autocmd("BufWritePre", {
+        pattern = "*",
+        callback = function(args)
+          if vim.g.disable_autoformat or vim.b[args.buf].disable_autoformat then
+            return
+          end
+          require("conform").format({ bufnr = args.buf })
+        end,
+      })
+
+      vim.api.nvim_create_user_command("Format", function(args)
+        local range = nil
+        if args.count ~= -1 then
+          local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
+          range = {
+            start = { args.line1, 0 },
+            ["end"] = { args.line2, end_line:len() },
+          }
+        end
+        require("conform").format({ async = true })
+      end, { range = true })
+
+        require("conform").setup(
+{
       log_level = vim.log.levels.DEBUG,
       formatters_by_ft = {
-
+        rust = { "rustfmt" },
-        rust = { "rustfmt", lsp_format = "fallback" },
         -- Conform will run multiple formatters sequentially
         -- go = { "goimports", "gofmt" },
         -- Use a sub-list to run only the first available formatter
-        -- javascript = { { "prettierd", "prettier" } },
         lua = { "stylua" },
         -- Conform will run multiple formatters sequentially
-        python = { "isort", "black" },
+        python = { "isort" },
         -- Use a sub-list to run only the first available formatter
-        javascript = { { "prettierd", "prettier" } },
+        javascript = { "prettier" },
         gdscript = { "gdformat" },
+        ron = { "ronfmt" },
         dashboard = {},
         -- Use the "*" filetype to run formatters on all filetypes.
-        ["*"] = { "codespell" },
+        -- ["*"] = { "codespell" },
         -- Use the "_" filetype to run formatters on filetypes that don't
         -- have other formatters configured.
         ["_"] = { "trim_whitespace" },
       },
-      format_on_save = function(bufnr)
-        -- Disable with a global or buffer-local variable
-      end,
       formatters = {
+        -- ronfmt = {
+        -- 	command = "ronfmt",
+        -- 	args = { "-d", "$FILENAME" },
+        -- },
         gdformat = {
           prepend_args = { "-l", "100" },
         },
       },
-    },
+    })
+    end,
   },
 }

vim/.vim/lua/plugins/dev.lua

@@ -0,0 +1,6 @@
+return {
+  -- {
+  --   "squk/google3.nvim",
+  --   dev = true,
+  -- },
+}

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

@@ -1,6 +1,20 @@
 -- disable underline
+local use_google = require("utils").use_google
 vim.diagnostic.handlers.underline.show = function() end
 
+local signs = {
+	Error = " ",
+	Warning = " ",
+	Warn = " ",
+	Hint = "",
+	Info = " ",
+	Other = "",
+}
+for type, icon in pairs(signs) do
+	local hl = "DiagnosticSign" .. type
+	vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+end
+
 return {
 	{
 		"folke/trouble.nvim",
@@ -11,32 +25,48 @@ return {
 				use_diagnostic_signs = true, -- enabling this will use the signs defined in your lsp client
 			})
 		end,
+    -- stylua: ignore
 		keys = {
-			{ "<leader>xt", "<cmd>:Telescope diagnostics<CR>" },
+			{ "<leader>xt", ":Telescope diagnostics<CR>" },
 			{ "gr", ":Telescope lsp_references<CR>" },
-			{ "<leader>xd", ":Trouble<CR>" },
+			{ "<leader>xd", ":Trouble diagnostics toggle <CR>" },
-			{ "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
+			{ "<leader>xbd", ":Trouble diagnostics toggle filter.buf=0<CR>" },
-			{ "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
+			{ "<leader>xe", ":Trouble diagnostics toggle filter.severity=vim.diagnostic.severity.ERROR<CR>" },
+			{ "[g", ":lua vim.diagnostic.goto_prev()<CR>" },
+			{ "]g", ":lua vim.diagnostic.goto_next()<CR>" },
 		},
 	},
 	{
-		"https://git.sr.ht/~whynothugo/lsp_lines.nvim",
+		"rachartier/tiny-inline-diagnostic.nvim",
+		event = "LspAttach",
+		priority = 1000, -- needs to be loaded in first
+		cond = not use_google(),
+		config = function()
+			vim.diagnostic.config({ virtual_text = false })
+
+			require("tiny-inline-diagnostic").setup({
+				preset = "classic", -- Can be: "modern", "classic", "minimal", "powerline", ghost", "simple", "nonerdfont", "amongus"
+
+				-- Show the source of the diagnostic.
+				show_source = false,
+
+				-- Use your defined signs in the diagnostic config table.
+				use_icons_from_diagnostic = true,
+
+				-- Enable diagnostic message on all lines.
+				multilines = true,
+
+				-- Show all diagnostics on the cursor line.
+				show_all_diags_on_cursorline = false,
+			})
+		end,
+	},
+	{
+		"ErichDonGubler/lsp_lines.nvim",
 		event = { "LspAttach" },
 		name = "lsp_lines.nvim",
+		cond = use_google(),
 		config = function()
-			local signs = {
-				Error = " ",
-				Warning = " ",
-				Warn = " ",
-				Hint = "",
-				Info = " ",
-				Other = "",
-			}
-			for type, icon in pairs(signs) do
-				local hl = "DiagnosticSign" .. type
-				vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
-			end
-
 			require("lsp_lines").setup()
 
 			-- vim.schedule(function()

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

@@ -1,7 +1,7 @@
 local use_google = require("utils").use_google
 
 if not use_google() then
-	return {}
+  return {}
 end
 
 vim.opt.rtp:append("/google/src/head/depot/google3/experimental/users/fentanes/nvgoog/")
@@ -11,324 +11,302 @@ local glugOpts = require("glug").glugOpts
 local superlazy = require("nvgoog.util.superlazy")
 
 return {
-	-- { url = "sso://user/fentanes/nvgoog" },
+  { import = "nvgoog.google.format" },
-	-- Prevent long sessions from losing cwd
+  -- maktaba is required by all google plugins
-	-- Load google paths like //google/* with `gf`
+  glug("maktaba", {
-	-- { import = "nvgoog.google.misc" },
+    lazy = true,
-	{ import = "nvgoog.google.format" },
+    dependencies = {},
-	-- maktaba is required by all google plugins
+    config = function() -- init?
-	glug("maktaba", {
+      vim.cmd("source /usr/share/vim/google/glug/bootstrap.vim")
-		lazy = true,
+    end,
-		dependencies = {},
+  }),
-		config = function() -- init?
+  glug("googler", {
-			vim.cmd("source /usr/share/vim/google/glug/bootstrap.vim")
+    event = "VeryLazy",
-		end,
+  }),
-	}),
+  glug("glaive"),
-	glug("googler", {
+  glug("alert"),
-		event = "VeryLazy",
+  glug("googlespell"),
-	}),
+  -- Add support for google filetypes
-	glug("core"),
+  glug("google-filetypes", { event = { "BufReadPre", "BufNewFile" }, dependencies = {} }),
-	glug("glaive"),
-	glug("alert"),
-	glug("csearch"),
-	glug("languages"),
-	glug("googlespell"),
-	-- Enable logmsgs ASAP to avoid maktaba's log message queue filling up
-	glug("google-logo"),
-	-- Add support for google filetypes
-	glug("google-filetypes", { event = { "BufReadPre", "BufNewFile" }, dependencies = {} }),
 
-	glug("add_usings"),
+  glug("add_usings"),
-	-- Autogens boilerplate when creating new files
+  -- Autogens boilerplate when creating new files
-	glug("autogen", {
+  glug("autogen", {
-		event = "BufNewFile",
+    event = "BufNewFile",
-	}),
+  }),
-	-- Adds G4 support to the vcscommand plugin
+  -- Adds G4 support to the vcscommand plugin
-	glug("googlepaths"),
+  glug("googlepaths"),
-	-- Set up syntax, indent, and core settings for various filetypes
+  -- Set up syntax, indent, and core settings for various filetypes
-	superlazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })),
+  superlazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })),
-	-- superlazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })),
+  -- superlazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })),
-	superlazy(glug("ft-gcl", { event = "BufRead,BufNewFile *.gcl" })),
+  superlazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })),
-	superlazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })),
+  superlazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
-	superlazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
+  superlazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
-	superlazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
+  superlazy(glug("ft-python", { event = "BufRead,BufNewFile *.py" })),
-	superlazy(glug("ft-python", { event = "BufRead,BufNewFile *.py" })),
 
-	-- Configures nvim to respect Google's coding style
+  -- Configures nvim to respect Google's coding style
-	superlazy(glug("googlestyle", { event = { "BufRead", "BufNewFile" } })),
+  superlazy(glug("googlestyle", { event = { "BufRead", "BufNewFile" } })),
 
-	glug("ft-soy"),
+  glug("ft-soy"),
-	glug("ft-gss"),
+  glug("ft-gss"),
-	glug("ft-proto"),
+  glug("ft-proto"),
-	glug("g4"),
+  glug("g4"),
-	glug("outline-window"),
+  glug("outline-window"),
-	glug("fzf-query"),
+  glug("fzf-query"),
-	-- Open current file in chrome
+  -- Open current file in chrome
-	glug("corpweb", {
+  glug("corpweb", {
-		dependencies = {
+    dependencies = {
-			glug("launchbrowser"),
+      glug("launchbrowser"),
-		},
+    },
-		cmd = {
+    cmd = {
-			-- Launches {query} under codesearch in a web browser
+      -- Launches {query} under codesearch in a web browser
-			"CorpWebCs",
+      "CorpWebCs",
-			-- Launches the current file under codesearch in a web browser
+      -- Launches the current file under codesearch in a web browser
-			"CorpWebCsFile",
+      "CorpWebCsFile",
-			-- Launches the current file doc view (i.e., Cantata, G3Docs, or godoc)
+      -- Launches the current file doc view (i.e., Cantata, G3Docs, or godoc)
-			"CorpWebDocFindFile",
+      "CorpWebDocFindFile",
-			-- Launches the current CL in Critique
+      -- Launches the current CL in Critique
-			"CorpWebCritiqueCl",
+      "CorpWebCritiqueCl",
-			-- Launches the current CL in Cider
+      -- Launches the current CL in Cider
-			"CorpWebCider",
+      "CorpWebCider",
-			-- Launches {query} under cs.chromium.org in a web browser
+      -- Launches {query} under cs.chromium.org in a web browser
-			"CorpWebChromeCs",
+      "CorpWebChromeCs",
-		},
+    },
-	}),
+  }),
-	glug("relatedfiles", {
+  glug("relatedfiles", {
-  -- stylua: ignore
+    -- stylua: ignore
-		keys = {
+    keys = {
-			{ "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
+      { "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
-			{ "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
+      { "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
-			{ "<leader>rh", ":exec relatedfiles#selector#JumpToHeader()<CR>" },
+      { "<leader>rh", ":exec relatedfiles#selector#JumpToHeader()<CR>" },
-			{ "<leader>rc", ":exec relatedfiles#selector#JumpToCodeFile()<CR>" },
+      { "<leader>rc", ":exec relatedfiles#selector#JumpToCodeFile()<CR>" },
-		},
+    },
-	}),
+  }),
-	{ "junegunn/fzf", dir = "~/.fzf", build = "./install --all" },
+  { "junegunn/fzf",                 dir = "~/.fzf",                   build = "./install --all" },
-	{ "junegunn/fzf.vim", dependencies = { "junegunn/fzf" } },
+  { "junegunn/fzf.vim",             dependencies = { "junegunn/fzf" } },
-	-- Format google code
+  -- Format google code
-	glug("codefmt-google", {
+  glug("codefmt-google", {
-		dependencies = {
+    dependencies = {
-			glug("codefmt", {
+      glug("codefmt", {
-				opts = {
+        opts = {
-					clang_format_executable = "/usr/bin/clang-format",
+          clang_format_executable = "/usr/bin/clang-format",
-					clang_format_style = "function('codefmtgoogle#GetClangFormatStyle')",
+          clang_format_style = "function('codefmtgoogle#GetClangFormatStyle')",
-					gofmt_executable = "/usr/lib/google-golang/bin/gofmt",
+          gofmt_executable = "/usr/lib/google-golang/bin/gofmt",
-					prettier_executable = "/google/data/ro/teams/prettier/prettier",
+          prettier_executable = "/google/data/ro/teams/prettier/prettier",
-					ktfmt_executable = { "/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt", "--google-style" },
+          ktfmt_executable = { "/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt", "--google-style" },
-				},
+        },
-			}),
+      }),
-		},
+    },
-		opts = {
+    opts = {
-			auto_format = {
+      auto_format = {
-				["borg"] = "gclfmt",
+        ["borg"] = "gclfmt",
-				["gcl"] = "gclfmt",
+        ["gcl"] = "gclfmt",
-				["patchpanel"] = "gclfmt",
+        ["patchpanel"] = "gclfmt",
-				["bzl"] = "buildifier",
+        ["bzl"] = "buildifier",
-				["c"] = "clang-format",
+        ["c"] = "clang-format",
-				["cpp"] = "clang-format",
+        ["cpp"] = "clang-format",
-				["javascript"] = "clang-format",
+        ["javascript"] = "clang-format",
-				["typescript"] = "clang-format",
+        ["typescript"] = "clang-format",
-				["dart"] = "dartfmt",
+        ["dart"] = "dartfmt",
-				["go"] = "gofmt",
+        ["go"] = "gofmt",
-				["java"] = "google-java-format",
+        ["java"] = "google-java-format",
-				["kotlin"] = "ktfmt",
+        ["kotlin"] = "ktfmt",
-				["jslayout"] = "jslfmt",
+        ["jslayout"] = "jslfmt",
-				["markdown"] = "mdformat",
+        ["markdown"] = "mdformat",
-				["ncl"] = "nclfmt",
+        ["ncl"] = "nclfmt",
-				["python,piccolo"] = "pyformat",
+        ["python,piccolo"] = "pyformat",
-				["soy"] = "soyfmt",
+        ["soy"] = "soyfmt",
-				["textpb"] = "text-proto-format",
+        ["textpb"] = "text-proto-format",
-				["proto"] = "protofmt",
+        ["proto"] = "protofmt",
-				["sql"] = "format_sql",
+        ["sql"] = "format_sql",
-			},
+      },
-		},
+    },
-		cmd = { "FormatLines", "FormatCode", "AutoFormatBuffer" },
+    cmd = { "FormatLines", "FormatCode", "AutoFormatBuffer" },
-		event = "VimEnter",
+    event = "VimEnter",
 
-		-- Setting up autocmds in init allows deferring loading the plugin until
+    -- Setting up autocmds in init allows deferring loading the plugin until
-		-- the `BufWritePre` event. One caveat is we must call `codefmt#FormatBuffer()`
+    -- the `BufWritePre` event. One caveat is we must call `codefmt#FormatBuffer()`
-		-- manually the first time since the plugin relies on the `BufWritePre` command to call it,
+    -- manually the first time since the plugin relies on the `BufWritePre` command to call it,
-		-- but by the time it's first loaded it has already happened.
+    -- but by the time it's first loaded it has already happened.
-		-- TODO: check if that is fixed when the following issue is fixed
+    -- TODO: check if that is fixed when the following issue is fixed
-		-- https://github.com/folke/lazy.nvim/issues/858
+    -- https://github.com/folke/lazy.nvim/issues/858
-		-- if so, remove the call to `FormatBuffer`
+    -- if so, remove the call to `FormatBuffer`
-		init = function(plugin)
+    init = function(plugin)
-			local group = vim.api.nvim_create_augroup("autoformat_settings", {})
+      local group = vim.api.nvim_create_augroup("autoformat_settings", {})
-			local function autocmd(filetypes, formatter)
+      local function autocmd(filetypes, formatter)
-				vim.api.nvim_create_autocmd("FileType", {
+        vim.api.nvim_create_autocmd("FileType", {
-					pattern = filetypes,
+          pattern = filetypes,
-					group = group,
+          group = group,
-					callback = function(event)
+          callback = function(event)
-						vim.api.nvim_create_autocmd("BufWritePre", {
+            vim.api.nvim_create_autocmd("BufWritePre", {
-							buffer = event.buf,
+              buffer = event.buf,
-							group = group,
+              group = group,
-							once = true,
+              once = true,
-							command = "call codefmt#FormatBuffer() | AutoFormatBuffer " .. formatter,
+              command = "call codefmt#FormatBuffer() | AutoFormatBuffer " .. formatter,
-						})
+            })
-					end,
+          end,
-				})
+        })
-			end
+      end
-			-- Build opts from possible parent specs since lazy.nvim doesn't provide it in `init`
+      -- Build opts from possible parent specs since lazy.nvim doesn't provide it in `init`
-			local plugin_opts = require("lazy.core.plugin").values(plugin, "opts", false)
+      local plugin_opts = require("lazy.core.plugin").values(plugin, "opts", false)
-			for filetypes, formatter in pairs(plugin_opts.auto_format or {}) do
+      for filetypes, formatter in pairs(plugin_opts.auto_format or {}) do
-				autocmd(filetypes, formatter)
+        autocmd(filetypes, formatter)
-			end
+      end
-		end,
+    end,
-	}),
+  }),
 
-	-- Run blaze commands
+  -- Run blaze commands
-	glug("blaze", {
+  glug("blaze", {
-		dependencies = {
+    dependencies = {
-			glug("blazedeps"),
+      glug("blazedeps"),
-		},
+    },
-		cmd = {
+    cmd = {
-			"Blaze",
+      "Blaze",
-			"BlazeGoToSponge",
+      "BlazeGoToSponge",
-			"BlazeViewCommandLog",
+      "BlazeViewCommandLog",
-			"BlazeLoadErrors",
+      "BlazeLoadErrors",
-			"BlazeDebugCurrentFileTest",
+      "BlazeDebugCurrentFileTest",
-			"BlazeDebugCurrentTestMethod",
+      "BlazeDebugCurrentTestMethod",
-			"BlazeDebugAddBreakpoint",
+      "BlazeDebugAddBreakpoint",
-			"BlazeDebugClearBreakpoint",
+      "BlazeDebugClearBreakpoint",
-			"BlazeDebugFinish",
+      "BlazeDebugFinish",
-			"BlazeDepsUpdate",
+      "BlazeDepsUpdate",
-		},
+    },
-		config = function()
+    keys = function()
-			require("config.blaze")
+      local function runCommandWithTarget(cmd)
-		end,
+        return function()
-		keys = function()
+          local targets = table.concat(vim.fn["blaze#GetTargets"](), " ")
-			local function runCommandWithTarget(cmd)
+          local command = "VimuxRunCommand('" .. cmd .. " " .. targets .. "')"
-				return function()
+          print(vim.inspect(command))
-					local targets = table.concat(vim.fn["blaze#GetTargets"](), " ")
+          vim.cmd(command)
-					local command = "VimuxRunCommand('" .. cmd .. " " .. targets .. "')"
+        end
-					print(vim.inspect(command))
+      end
-					vim.cmd(command)
+      return {
-				end
+        { "<leader>b",  desc = "Blaze" },
-			end
+        { "<leader>bb", runCommandWithTarget("blaze build"),   desc = "Blaze Build" },
-			return {
+        { "<leader>br", runCommandWithTarget("blaze run"),     desc = "Blaze Run" },
-				{ "<leader>b", desc = "Blaze" },
+        { "<leader>bt", runCommandWithTarget("blaze test"),    desc = "Blaze Test" },
-				{ "<leader>bb", runCommandWithTarget("blaze build"), desc = "Blaze Build" },
+        { "<leader>bc", runCommandWithTarget("build_cleaner"), desc = "Blaze Run" },
-				{ "<leader>br", runCommandWithTarget("blaze run"), desc = "Blaze Run" },
+        {
-				{ "<leader>bt", runCommandWithTarget("blaze test"), desc = "Blaze Test" },
+          "<leader>yb",
-				{ "<leader>bc", runCommandWithTarget("build_cleaner"), desc = "Blaze Run" },
+          ":let t = join(blaze#GetTargets(), ' ') | echo t | let @+ = t | let @\" = t<CR>",
-				{
+          desc = "Yank Blaze Target",
-					"<leader>yb",
+        },
-					":let t = join(blaze#GetTargets(), ' ') | echo t | let @+ = t | let @\" = t<CR>",
+        {
-					desc = "Yank Blaze Target",
+          "<leader>bq",
-				},
+          function()
-				{
+            local targets = vim.fn["blaze#GetTargets"]()
-					"<leader>bq",
+            for _, t in ipairs(targets) do
-					function()
+              print(vim.inspect(t))
-						local targets = vim.fn["blaze#GetTargets"]()
+              vim.cmd("VimuxRunCommand('blaze query " .. t:gsub(":.+", "") .. ":\\*" .. "')")
-						for _, t in ipairs(targets) do
+            end
-							print(vim.inspect(t))
+          end,
-							vim.cmd("VimuxRunCommand('blaze query " .. t:gsub(":.+", "") .. ":\\*" .. "')")
+          desc = "Blaze query the current package",
-						end
+        },
-					end,
+      }
-					desc = "Blaze query the current package",
+    end,
-				},
+  }),
-			}
+  -- Imports
-		end,
+  glug("imp-google", {
-	}),
+    dependencies = {
-	-- Imports
+      glugOpts("vim-imp", {
-	glug("imp-google", {
+        "flwyd/vim-imp",
-		dependencies = {
+        opts = {
-			glugOpts("vim-imp", {
+          ["Suggest[default]"] = { "buffer", "csearch", "ripgrep", "prompt" },
-				"flwyd/vim-imp",
+          ["Report[default]"] = "popupnotify",
-				opts = {
+          ["Location[default]"] = "packageroot",
-					["Suggest[default]"] = { "buffer", "csearch", "ripgrep", "prompt" },
+          -- ["Location[gcl]"] = "parent",
-					["Report[default]"] = "popupnotify",
+          ["Pick[default]"] = "fzf",
-					["Location[default]"] = "packageroot",
+        },
-					-- ["Location[gcl]"] = "parent",
+      }),
-					["Pick[default]"] = "fzf",
+    },
-				},
+    cmd = { "ImpSuggest", "ImpFirst" },
-			}),
+    keys = {
-		},
+      { "<leader>I", ":ImpSuggest <C-r><C-w><cr>" },
-		cmd = { "ImpSuggest", "ImpFirst" },
+    },
-		keys = {
+  }),
-			{ "<leader>i", ":ImpSuggest <C-r><C-w><cr>" },
+  {
-		},
+    url = "sso://user/fentanes/googlepaths.nvim",
-	}),
+    event = { "VeryLazy", "BufReadCmd //*", "BufReadCmd google3/*" },
-	{
+    opts = {},
-		url = "sso://user/fentanes/googlepaths.nvim",
+  },
-		event = { "VeryLazy", "BufReadCmd //*" },
+  {
-		opts = {},
+    name = "ai.nvim",
-	},
+    url = "sso://googler@user/vvvv/ai.nvim",
-	{
+  },
-		name = "ai.nvim",
+  {
-		url = "sso://googler@user/vvvv/ai.nvim",
+    name = "cmp-nvim-ciderlsp",
-	},
+    url = "sso://googler@user/piloto/cmp-nvim-ciderlsp",
-	{
+    event = "VimEnter",
-		name = "cmp-nvim-ciderlsp",
+  },
-		url = "sso://googler@user/piloto/cmp-nvim-ciderlsp",
+  {
-		event = "VimEnter",
+    name = "ciderlsp-nvim",
-		dependencies = {
+    url = "sso://googler@user/kdark/ciderlsp-nvim",
-			"hrsh7th/nvim-cmp",
+    event = "VimEnter",
-		},
+  },
-	},
+  -- {
-	{
+  --     name = "nvim_figtree",
-		name = "ciderlsp-nvim",
+  --     url = "sso://googler@user/jackcogdill/nvim-figtree",
-		url = "sso://googler@user/kdark/ciderlsp-nvim",
+  -- },
-		event = "VimEnter",
+  {
-		dependencies = {
+    name = "telescope_codesearch",
-			"hrsh7th/nvim-cmp",
+    url = "sso://googler@user/vintharas/telescope-codesearch.nvim",
-		},
+    dependencies = { "nvim-telescope/telescope.nvim" },
-	},
+    config = function() end,
-	-- {
+  },
-	--     name = "nvim_figtree",
+  {
-	--     url = "sso://googler@user/jackcogdill/nvim-figtree",
+    name = "telescope_citc",
-	-- },
+    url = "sso://googler@user/aktau/telescope-citc.nvim",
-	{
+    dependencies = { "nvim-telescope/telescope.nvim" },
-		name = "telescope_codesearch",
+  },
-		url = "sso://googler@user/vintharas/telescope-codesearch.nvim",
+  {
-		dependencies = { "nvim-telescope/telescope.nvim" },
+    name = "telescope_fig",
-		config = function()
+    url = "sso://googler@user/tylersaunders/telescope-fig.nvim",
-		end,
+    dependencies = { "nvim-telescope/telescope.nvim" },
-	},
+  },
-	{
+  {
-		name = "telescope_citc",
+    name = "critique-nvim",
-		url = "sso://googler@user/aktau/telescope-citc.nvim",
+    dir = "~/critique-nvim/",
-		dependencies = { "nvim-telescope/telescope.nvim" },
+    lazy = false,
-	},
+    dependencies = {
-	{
+      "rktjmp/time-ago.vim",
-		name = "telescope_fig",
+      "nvim-lua/plenary.nvim",
-		url = "sso://googler@user/tylersaunders/telescope-fig.nvim",
+      "nvim-telescope/telescope.nvim",
-		dependencies = { "nvim-telescope/telescope.nvim" },
+      "runiq/neovim-throttle-debounce",
-	},
+    },
-	{
+    -- here are some mappings you might want:
-		name = "critique-nvim",
+    keys = {
-		dir = "~/critique-nvim/",
+      { "<Leader>lc", ":CritiqueToggleLineComment<CR>" },
-		lazy = false,
+      { "<Leader>ac", ":CritiqueToggleAllComments<CR>" },
-		dependencies = {
+      { "<Leader>uc", ":CritiqueToggleUnresolvedComments<CR>" },
-			"rktjmp/time-ago.vim",
+      { "<Leader>fc", ":CritiqueFetchComments<CR>" },
-			"nvim-lua/plenary.nvim",
+      { "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
-			"nvim-telescope/telescope.nvim",
+    },
-			"runiq/neovim-throttle-debounce",
+    config = function()
-		},
+      -- Here are all the options and their default values:
-		-- here are some mappings you might want:
+      require("critique.comments").setup({
-		keys = {
+        -- debug = 1, -- default = 0
-			{ "]c", ":CritiqueGotoNextComment<CR>" },
+        -- Fetch the comments after calling `setup`.
-			{ "[c", ":CritiqueGotoPrevComment<CR>" },
+        auto_fetch = true,     -- default = true
-			{ "<Leader>lc", ":CritiqueToggleLineComment<CR>" },
+        auto_render = true,    -- default = true
-			{ "<Leader>ac", ":CritiqueToggleAllComments<CR>" },
+        -- Allow checking for comments on BufEnter events. This is throttled to once every 10 seconds.
-			{ "<Leader>uc", ":CritiqueToggleUnresolvedComments<CR>" },
+        frequent_fetch = true, -- default = false
-			{ "<Leader>fc", ":CritiqueFetchComments<CR>" },
+        verbose_notifications = true,
-			{ "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
+      })
-		},
+    end,
-		config = function()
+  },
-			-- Here are all the options and their default values:
+  {
-			require("critique.comments").setup({
+    url = "sso://googler@user/mccloskeybr/luasnip-google.nvim",
-				-- debug = 1, -- default = 0
+    config = function()
-				-- Fetch the comments after calling `setup`.
+      require("luasnip-google").load_snippets()
-				auto_fetch = true, -- default = true
+    end,
-				auto_render = true, -- default = true
+  },
-				-- Allow checking for comments on BufEnter events. This is throttled to once every 10 seconds.
+  {
-				frequent_fetch = true, -- default = false
+    name = "hg",
-				verbose_notifications = true,
+    url = "sso://googler@user/smwang/hg.nvim",
-			})
+    dependencies = { "ipod825/libp.nvim" },
-		end,
+    config = function()
-	},
+      require("hg").setup()
-	{
+    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",
-		dependencies = { "ipod825/libp.nvim" },
-		config = function()
-			require("hg").setup()
-		end,
-	},
 }

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

@@ -1,81 +0,0 @@
-return {
-	"theprimeagen/harpoon",
-	branch = "harpoon2",
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-		"nvim-telescope/telescope.nvim",
-	},
-	config = function()
-		local harpoon = require("harpoon")
-
-		-- REQUIRED
-		harpoon:setup()
-		-- REQUIRED
-
-		vim.keymap.set("n", "<leader>m", function()
-			harpoon:list():add()
-		end)
-		vim.keymap.set("n", "<leader>M", function()
-			harpoon.ui:toggle_quick_menu(harpoon:list())
-		end)
-
-		vim.keymap.set("n", "<leader>1", function()
-			harpoon:list():select(1)
-		end)
-		vim.keymap.set("n", "<leader>2", function()
-			harpoon:list():select(2)
-		end)
-		vim.keymap.set("n", "<leader>3", function()
-			harpoon:list():select(3)
-		end)
-		vim.keymap.set("n", "<leader>4", function()
-			harpoon:list():select(4)
-		end)
-
-		-- Toggle previous & next buffers stored within Harpoon list
-		vim.keymap.set("n", "<C-S-P>", function()
-			harpoon:list():prev()
-		end)
-		vim.keymap.set("n", "<C-S-N>", function()
-			harpoon:list():next()
-		end)
-
-		-- basic telescope configuration
-		local conf = require("telescope.config").values
-		local function toggle_telescope(harpoon_files)
-			local file_paths = {}
-			for _, item in ipairs(harpoon_files.items) do
-				table.insert(file_paths, item.value)
-			end
-
-			require("telescope.pickers")
-				.new({}, {
-					prompt_title = "Harpoon",
-					finder = require("telescope.finders").new_table({
-						results = file_paths,
-					}),
-					previewer = conf.file_previewer({}),
-					sorter = conf.generic_sorter({}),
-				})
-				:find()
-		end
-
-		vim.keymap.set("n", "<leader>h", function()
-			toggle_telescope(harpoon:list())
-		end, { desc = "Open harpoon window" })
-	end,
-	-- stylua: ignore
-	-- keys = {
-	-- 	-- Mark current file
-	-- 	{ "<leader>m", ":lua require('harpoon').mark_file()<CR>" },
-	--
-	-- 	-- Go to marks tracker (editable, use `gf` to go to file under cursor)
-	-- 	{ "<leader>M", "lua require('lasso').open_marks_tracker()<CR>" },
-	--
-	-- 	-- Jump to n-th marked file (n-th line of marks tracker)
-	-- 	{ "<leader>1", "lua require('lasso').open_marked_file(1)<CR>" },
-	-- 	{ "<leader>2", "lua require('lasso').open_marked_file(2)<CR>" },
-	-- 	{ "<leader>3", "lua require('lasso').open_marked_file(3)<CR>" },
-	-- 	{ "<leader>4", "lua require('lasso').open_marked_file(4)<CR>" },
-	-- },
-}

vim/.vim/lua/plugins/leap.lua

@@ -1,6 +0,0 @@
-return {
-	"ggandor/leap.nvim",
-	config = function()
-		require("leap").add_default_mappings()
-	end,
-}

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

@@ -1,84 +1,60 @@
 local use_google = require("utils").use_google
 local flags = require("utils").flags
 
+local function add_import()
+  vim.lsp.buf.code_action({
+    apply = true,
+    context = {
+      only = { "quickfix.addImports" },
+    },
+  })
+end
+
+
 return {
-	{
+  {
-		"ray-x/lsp_signature.nvim",
+    "kosayoda/nvim-lightbulb",
-		event = "VeryLazy",
+    commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
-		opts = {
+    event = { "LspAttach" },
-			floating_window = true,
+    opts = {
-			hint_prefix = "󰡱 ",
+      autocmd = { enabled = true },
-		},
+      virtual_text = {
-		config = function(_, opts)
+        enabled = true,
-			require("lsp_signature").setup(opts)
+        text = " 󱐋",
-		end,
+        hl = "DiagnosticWarn",
-	},
+      },
-	{
+      sign = { enabled = false },
-		"luozhiya/lsp-virtual-improved.nvim",
+    },
-		event = { "LspAttach" },
+  },
-		config = function()
+  {
-			require("lsp-virtual-improved").setup()
+    "L3MON4D3/LuaSnip",
-		end,
+    build = "make install_jsregexp",
-	},
+    config = function()
-	{
+      require("luasnip.loaders.from_vscode").lazy_load()
-		"kosayoda/nvim-lightbulb",
+    end,
-		commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
+    dependencies = { "rafamadriz/friendly-snippets" },
-		event = { "LspAttach" },
+  },
-		opts = {
+  {
-			autocmd = { enabled = true },
+    "ray-x/go.nvim",
-			virtual_text = {
+    dependencies = { -- optional packages
-				enabled = true,
+      "ray-x/guihua.lua",
-				text = " 󱐋",
+      "neovim/nvim-lspconfig",
-				hl = "DiagnosticWarn",
+      "nvim-treesitter/nvim-treesitter",
-			},
+    },
-			sign = { enabled = false },
+    -- cond = not use_google(),
-		},
+    config = function()
-	},
+      local capabilities = flags.blink
-	{
+          and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
-		"L3MON4D3/LuaSnip",
+          or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-		build = "make install_jsregexp",
+      capabilities.offsetEncoding = { "utf-16" }
-		config = function()
+      require("go").setup({
-			require("luasnip.loaders.from_vscode").lazy_load()
+        lsp_cfg = { capabilities = capabilities },
-		end,
+        lsp_keymaps = false,
-		dependencies = { "rafamadriz/friendly-snippets" },
+        lsp_inlay_hints = {
-	},
+          enable = not use_google(), -- doesn't work with ciderlsp
-	{
+        },
-		"hinell/lsp-timeout.nvim",
+      })
-		event = { "LspAttach" },
+      -- Run gofmt + goimports on save
-		dependencies = { "neovim/nvim-lspconfig" },
-		-- cond = not use_google(),
-		config = function()
-			vim.g.lspTimeoutConfig = {
-				filetypes = {
-					ignore = { -- filetypes to ignore; empty by default
-						"gdscript",
-						"rust",
-					}, -- for these filetypes
-				},
-			}
-		end,
-	},
-	{
-		"ray-x/go.nvim",
-		dependencies = { -- optional packages
-			"ray-x/guihua.lua",
-			"neovim/nvim-lspconfig",
-			"nvim-treesitter/nvim-treesitter",
-		},
-		-- cond = not use_google(),
-		config = function()
-			local capabilities = flags.blink
-					and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
-				or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-			capabilities.offsetEncoding = { "utf-16" }
-			require("go").setup({
-				lsp_cfg = { capabilities = capabilities },
-				lsp_keymaps = false,
-				lsp_inlay_hints = {
-					enable = not use_google(), -- doesn't work with ciderlsp
-				},
-			})
-			-- Run gofmt + goimports on save
 
 			local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})
 			vim.api.nvim_create_autocmd("BufWritePre", {
@@ -96,47 +72,69 @@ return {
 		"neovim/nvim-lspconfig",
 		dependencies = {
 			"hrsh7th/nvim-cmp",
+			"saghen/blink.cmp",
+			"saghen/blink.compat",
 			"nvim-lua/lsp-status.nvim",
 			"VonHeikemen/lsp-zero.nvim",
 		},
-  -- stylua: ignore
 		keys = {
-			{ "<leader>F", "<cmd>lua vim.lsp.buf.format()<CR>" },
+			{ "<leader>F", ":lua vim.lsp.buf.format()<CR>" },
-
+			{ "<leader>i", add_import },
-			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
+			{ "<leader>rn", ":lua vim.lsp.buf.rename()<CR>" },
-			{ "L", "<cmd>lua vim.lsp.buf.hover()<CR>" },
+			{ "L", ":lua vim.lsp.buf.hover()<CR>" },
-			{ "gr", "<Cmd>Telescope lsp_references<CR>" },
+			{ "gr", ":Telescope lsp_references<CR>" },
-			{ "gd", "<cmd>Telescope lsp_definitions<CR>" },
+			{ "gd", ":lua vim.lsp.buf.definition()<CR>" },
-			{ "gD", "<cmd>tab split | lua vim.lsp.buf.definition()<CR>" },
+			-- { "gd", "<cmd>Telescope lsp_definitions<CR>" },
-			{ "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
+			{ "gD", ":tab split | lua vim.lsp.buf.definition()<CR>" },
-			{ "gI", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
+			{ "gi", ":lua vim.lsp.buf.implementation()<CR>" },
-			{ "gR", "<cmd>lua vim.lsp.buf.references()<CR>" },
+			{ "gI", ":lua vim.lsp.buf.implementation()<CR>" },
-			{ "gt", "<cmd>lua vim.lsp.buf.type_definition()<CR>" },
+			{ "gR", ":lua vim.lsp.buf.references()<CR>" },
-			{ "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
+			{ "gt", ":lua vim.lsp.buf.type_definition()<CR>" },
-			{ "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
+			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>" },
+			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
 		},
 		config = function()
-			local lsp_status = require("lsp-status")
-			lsp_status.register_progress()
-
-			local capabilities = flags.blink
-					and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
-				or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-			capabilities = vim.tbl_extend("keep", capabilities or {}, lsp_status.capabilities)
-			capabilities.offsetEncoding = { "utf-16" }
-
 			local lspconfig = require("lspconfig")
-			local configs = require("lspconfig.configs")
+			local lsp_configs = require("lspconfig.configs")
-			require("config.lsp-google").setup(capabilities)
 
-			-- Godot
+      lsp_configs.ciderlsp = {
-			lspconfig.gdscript.setup({
+        default_config = {
-				-- flags = {
+          cmd = {
-				-- 	debounce_text_changes = 2000, -- Wait 5 seconds before sending didChange
+            "/google/bin/releases/cider/ciderlsp/ciderlsp",
-				-- },
+            "--tooltag=nvim-lsp",
-			})
+            "--noforward_sync_responses",
-			vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
+          },
-			vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
+          filetypes = {
-		end,
+            "c",
-	},
+            "cpp",
+            "java",
+            "kotlin",
+            "objc",
+            "proto",
+            "textproto",
+            "go",
+            "python",
+            "bzl",
+            "typescript",
+          },
+          offset_encoding = "utf-8",
+          root_dir = lspconfig.util.root_pattern(".citc"),
+          settings = {},
+        },
+      }
+
+      if use_google() then
+        lspconfig.ciderlsp.setup({})
+      end
+
+      lspconfig.gdscript.setup({})
+      -- require('lspconfig').gdscript.setup { cmd = { "ncat", "localhost", "6005" }, root_dir = function()
+      --   return vim.fs.dirname(vim.fs.find('project.godot', { upward = true })[1])
+      -- end
+      -- }
+
+      vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
+      vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4 wrap]])
+    end,
+  },
 }

vim/.vim/lua/plugins/lualine.lua

@@ -1,84 +1,41 @@
-local split = function(inputstr, sep)
-	local t = {}
-	for str in string.gmatch(inputstr, "([^" .. sep .. "]+)") do
-		table.insert(t, str)
-	end
-	return t
-end
-local function getCitc()
-	local fname = vim.api.nvim_buf_get_name(0)
-	if string.find(fname, "/google/src/cloud/", 1, true) then
-		local parts = split(fname, "/")
-		return parts[5]
-	end
-end
-local function isCiderLspAttached()
-	if vim.b["is_cider_lsp_attached"] then
-		if vim.b["is_cider_lsp_attached"] == "yes" then
-			return "✓"
-		else
-			return "x"
-		end
-	else
-		return ""
-	end
-end
-
-local function getLightbulb()
-	return require("nvim-lightbulb").get_status_text()
-end
-
-local function getLGTMs()
-	local comments = require("google.comments")
-	local tracker = require("google.comments.tracker")
-	local dump = require("utils").dump
-
-	print(dump(tracker.get_all_comments()))
-	local lgtm = comments.get_lgtms()
-	local appr = comments.get_approvals()
-	print("lgtms" .. dump(lgtm))
-	print("approvals" .. dump(appr))
-	return "LGTM:" .. table.concat(lgtm, ",") .. "   Approval:" .. table.concat(appr, ",")
-end
-
 return {
-	"nvim-lualine/lualine.nvim",
+  "nvim-lualine/lualine.nvim",
-	lazy = false,
+  lazy = false,
-	config = function()
+  config = function()
-		local lsp_status = require("lsp-status")
+    local lsp_status = require("lsp-status")
 
-		require("lualine").setup({
+    require("lualine").setup({
-			options = {
+      options = {
-				theme = "auto",
+        theme = "auto",
-				globalstatus = false,
+        globalstatus = false,
-				refresh = {
+        refresh = {
-					statusline = 1000,
+          statusline = 100,
-					-- tabline = 1000,
+          tabline = 100,
-					winbar = 1000,
+          winbar = 100,
-				},
+        },
-			},
+      },
-			sections = {
+      sections = {
-				lualine_a = { "mode" },
+        lualine_a = { "mode" },
-				lualine_b = { "branch", "diff", getCitc, isCiderLspAttached },
+        lualine_b = { "branch", "diff" },
-				lualine_c = {
+        lualine_c = {
-					getLightbulb,
+          require("nvim-lightbulb").get_status_text,
-					{
+          {
-						"filename",
+            "filename",
-						path = 4, -- 0 = just filename, 1 = relative path, 2 = absolute path
+            path = 4, -- 0 = just filename, 1 = relative path, 2 = absolute path
-					},
+          },
-				},
+        },
-				lualine_x = {
+        lualine_x = {
-					"",
+          "",
-					{
+          {
-						"diagnostics",
+            "diagnostics",
-						sources = { "nvim_lsp" },
+            sources = { "nvim_lsp" },
-						symbols = { error = " ", warn = " ", info = " ", hint = " " },
+            symbols = { error = " ", warn = " ", info = " ", hint = " " },
-					},
+          },
-					"filetype",
+          "filetype",
-				},
+        },
-				lualine_y = { "progress" },
+        lualine_y = { "progress" },
-				lualine_z = { "location" },
+        lualine_z = { "location" },
-			},
+      },
-		})
+    })
-	end,
+  end,
 }

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

@@ -1,35 +0,0 @@
-return {
-	{
-		"danymat/neogen",
-		config = function()
-			require("neogen").setup({ snippet_engine = "luasnip" })
-		end,
-	},
-	{
-		"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" },
-	config = function()
-		local ls = require("luasnip")
-
-		vim.keymap.set({ "i" }, "<Tab>", function()
-			ls.expand()
-		end, { silent = true })
-		vim.keymap.set({ "i", "s" }, "<Tab>", function()
-			ls.jump(1)
-		end, { silent = true })
-		vim.keymap.set({ "i", "s" }, "<S-Tab>", function()
-			ls.jump(-1)
-		end, { silent = true })
-
-		vim.keymap.set({ "i", "s" }, "<C-E>", function()
-			if ls.choice_active() then
-				ls.change_choice(1)
-			end
-		end, { silent = true })
-	end,
-}

vim/.vim/lua/plugins/minuet.lua

@@ -0,0 +1,44 @@
+return {
+  'milanglacier/minuet-ai.nvim',
+  config = function()
+    require('minuet').setup {
+      provider = 'gemini',
+      provider_options = {
+        gemini = {
+          optional = {
+            generationConfig = {
+              maxOutputTokens = 256,
+            },
+            safetySettings = {
+              {
+                -- HARM_CATEGORY_HATE_SPEECH,
+                -- HARM_CATEGORY_HARASSMENT
+                -- HARM_CATEGORY_SEXUALLY_EXPLICIT
+                category = 'HARM_CATEGORY_DANGEROUS_CONTENT',
+                -- BLOCK_NONE
+                threshold = 'BLOCK_ONLY_HIGH',
+              },
+            },
+          },
+        },
+      },
+      virtualtext = {
+        auto_trigger_ft = {},
+        keymap = {
+          -- accept whole completion
+          accept = '<A-A>',
+          -- accept one line
+          accept_line = '<A-a>',
+          -- accept n lines (prompts for number)
+          -- e.g. "A-z 2 CR" will accept 2 lines
+          accept_n_lines = '<A-z>',
+          -- Cycle to prev completion item, or manually invoke completion
+          prev = '<A-[>',
+          -- Cycle to next completion item, or manually invoke completion
+          next = '<A-]>',
+          dismiss = '<A-e>',
+        },
+      }
+    }
+  end,
+}

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

@@ -1,56 +1,52 @@
 local use_google = require("utils").use_google
 
 return {
-	-- {
+  -- {
-	-- 	"cmdtree",
+  -- 	"cmdtree",
-	-- 	dir = "~/cmdtree",
+  -- 	dir = "~/cmdtree",
-	-- },
+  -- },
-	{
+  {
-		"nvim-neo-tree/neo-tree.nvim",
+    "nvim-neo-tree/neo-tree.nvim",
-		dependencies = {
+    dependencies = {
-			"nvim-lua/plenary.nvim",
+      "nvim-lua/plenary.nvim",
-			"MunifTanjim/nui.nvim",
+      "MunifTanjim/nui.nvim",
---			"~/cmdtree",
+      --			"~/cmdtree",
-		},
+    },
-		cmd = {
+    cmd = {
-			"Neotree",
+      "Neotree",
-		},
+    },
-		config = function()
+    config = function()
-			require("neo-tree").setup({
+      require("neo-tree").setup({
-				hijack_netrw_behavior = "open_default",
+        hijack_netrw_behavior = "open_default",
-				filesystem = {
+        filesystem = {
-					filtered_items = {
+          filtered_items = {
-						hide_dotfiles = false,
+            hide_dotfiles = false,
-					},
+          },
-					bind_to_cwd = false,
+          bind_to_cwd = false,
-				},
+        },
-				sources = {
+        sources = {
-					"filesystem",
+          "filesystem",
-					"buffers",
+          "buffers",
-					"git_status",
+          "git_status",
-					--"cmdtree",
+          --"cmdtree",
-					-- ...and any additional source
+          -- ...and any additional source
-				},
+        },
-				window = {
+        window = {
-					mappings = {
+          mappings = {
-						["O"] = "expand_all_nodes",
+            ["O"] = "expand_all_nodes",
-					},
+          },
-				},
+        },
-			})
+      })
-		end,
+    end,
-  -- stylua: ignore
+    -- stylua: ignore
-		keys = {
+    keys = {
-			(function()
+      (function()
-				if use_google() then
+        if use_google() then
-					return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
+          return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
-				end
+        end
-				-- return { "<C-n>.", ":Neotree toggle reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" }
+        return { "<C-n>m", ":Neotree float git_status<CR>", desc = "Open NeoTree CWD float" }
-				return { "<C-n>m", ":Neotree float git_status<CR>", desc = "Open NeoTree CWD float" }
+      end)(),
-			end)(),
+      { "<C-n>", ":Neotree toggle left dir=%:p:h<cr>" },
-			-- { "<C-n>b", ":Neotree float buffers<CR>" },
+    },
-			{ "<C-n>f", ":Neotree float dir=%:p:h<cr>" },
+  },
-			{ "<C-n>", ":Neotree toggle dir=%:p:h<cr>" },
-			-- { "<C-n>.", ":Neotree reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" },
-		},
-	},
 }

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

@@ -5,9 +5,6 @@ return {
 			{ "nvim-lua/plenary.nvim" },
 			{ "nvim-treesitter/nvim-treesitter" },
 		},
-		config = function()
-			require("config.refactoring")
-		end,
   -- stylua: ignore
 		keys = {
 			-- remap to open the Telescope refactoring menu in visual mode

vim/.vim/lua/plugins/rust.lua

@@ -1,8 +1,59 @@
 return {
+	{ "ron-rs/ron.vim" },
 	{
 		"mrcjkb/rustaceanvim",
-		version = "^5", -- Recommended
+		version = vim.fn.has("nvim-0.10.0") == 0 and "^4" or false,
-		lazy = false, -- This plugin is already lazy
+		ft = { "rust" },
+		config = function(_, opts)
+			vim.g.rustaceanvim = vim.tbl_deep_extend("keep", vim.g.rustaceanvim or {}, opts or {})
+
+			for _, method in ipairs({ "textDocument/diagnostic", "workspace/diagnostic" }) do
+				local default_diagnostic_handler = vim.lsp.handlers[method]
+				vim.lsp.handlers[method] = function(err, result, context, config)
+					if err ~= nil and err.code == -32802 then
+						return
+					end
+					return default_diagnostic_handler(err, result, context, config)
+				end
+			end
+		end,
+		opts = {
+			server = {
+				default_settings = {
+					-- rust-analyzer language server configuration
+					["rust-analyzer"] = {
+						cargo = {
+							allFeatures = true,
+							loadOutDirsFromCheck = true,
+							buildScripts = {
+								enable = true,
+							},
+						},
+						procMacro = {
+							enable = true,
+							ignored = {
+								["async-trait"] = { "async_trait" },
+								["napi-derive"] = { "napi" },
+								["async-recursion"] = { "async_recursion" },
+							},
+						},
+						files = {
+							excludeDirs = {
+								".direnv",
+								".git",
+								".github",
+								".gitlab",
+								"bin",
+								"node_modules",
+								"target",
+								"venv",
+								".venv",
+							},
+						},
+					},
+				},
+			},
+		},
 	},
 	{
 		"saecki/crates.nvim",

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

@@ -1,83 +1,88 @@
 local use_google = require("utils").use_google
 
-local function setup_mercurial(hg_revision)
+local function change_diffbase(hg_revision, git_revision)
-	local git_cmd = "git diff --no-color --no-ext-diff -U0 -- %f"
+  vim.g.signify_vcs_cmds = {
-	local rcs_cmd = "rcsdiff -U0 %f 2>%n"
+    git = "git diff --no-color --diff-algorithm=histogram --no-ext-diff -U0 " .. git_revision .. " -- %f",
-	local svn_cmd = "svn diff --diff-cmd %d -x -U0 -- %f"
+    yadm = 'yadm diff --no-color --no-ext-diff -U0 -- %f',
-	local hg_diff = hg_revision .. " --color=never config aliases.diff= --nodates -U0 -- %f"
+    hg = 'chg --config alias.diff=diff diff '.. hg_revision .. ' --color=never --nodates -U0 -- %f',
-	local hg_cat = hg_revision .. " -- %f"
+    svn = 'svn diff --diff-cmd %d -x -U0 -- %f',
-
+    bzr = 'bzr diff --using %d --diff-options=-U0 -- %f',
-	vim.cmd(string.format(
+    darcs = 'darcs diff --no-pause-for-gui --no-unified --diff-opts=-U0 -- %f',
-		[[
+    fossil = 'fossil diff --unified -c 0 -- %f',
-let g:signify_vcs_cmds = {
+    cvs = 'cvs diff -U0 -- %f',
-      \ 'git':      '%s',
+    rcs = 'rcsdiff -U0 %f 2>%n',
-      \ 'rcs':      '%s',
+    accurev = 'accurev diff %f -- -U0',
-      \ 'svn':      '%s',
+    tfs = 'tf diff -version=W -noprompt -format=Unified %f'
-      \ 'hg':       'hg diff %s',
+  }
-      \ }
+  vim.g.signify_vcs_cmds_diffmode = {
-let g:signify_vcs_cmds_diffmode = {
+    git = "git show " .. git_revision .. ":./%f",
-      \ 'hg':       'hg cat %s',
+    hg = "chg cat " .. hg_revision .. " -- %f",
-      \ }
+    yadm = 'yadm show HEAD:./%f',
-  ]],
+    svn = 'svn cat %f',
-		git_cmd,
+    bzr = 'bzr cat %f',
-		rcs_cmd,
+    darcs = 'darcs show contents -- %f',
-		svn_cmd,
+    fossil = 'fossil cat %f',
-		hg_diff,
+    cvs = 'cvs up -p -- %f 2>%n',
-		hg_cat
+    rcs = 'co -q -p %f',
-	))
+    accurev = 'accurev cat %f',
+    perforce = 'p4 print %f',
+    tfs = 'tf view -version:W -noprompt %f',
+  }
 end
 
 _G.signify_dtup = function()
-	setup_mercurial('-r ".^"')
+  change_diffbase('-r ".^"', 'HEAD^')
-	vim.cmd([[:SignifyEnable]])
+  vim.cmd([[:SignifyEnable]])
-	vim.cmd([[:SignifyRefresh]])
+  vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_normal = function()
-	setup_mercurial("-r .")
+  change_diffbase("-r .", "")
-	vim.cmd([[:SignifyEnable]])
+  vim.cmd([[:SignifyEnable]])
-	vim.cmd([[:SignifyRefresh]])
+  vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_dtp4 = function()
-	setup_mercurial("-r p4head")
+  change_diffbase("-r p4head", "main")
-	vim.cmd([[:SignifyEnable]])
+  vim.cmd([[:SignifyEnable]])
-	vim.cmd([[:SignifyRefresh]])
+  vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_dtex = function()
-	setup_mercurial("-r exported(.)")
+  change_diffbase("-r exported(.)", "origin/main")
-	vim.cmd([[:SignifyEnable]])
+  vim.cmd([[:SignifyEnable]])
-	vim.cmd([[:SignifyRefresh]])
+  vim.cmd([[:SignifyRefresh]])
 end
 return {
-	"mhinz/vim-signify",
+  "mhinz/vim-signify",
-	event = "VimEnter",
+  event = "VimEnter",
   -- stylua: ignore
-	keys = {
+  keys = {
-		{ "]d", "<plug>(signify-next-hunk)" },
+    { "]d",          "<plug>(signify-next-hunk)" },
-		{ "[d", "<plug>(signify-prev-hunk)" },
+    { "[d",          "<plug>(signify-prev-hunk)" },
-		{ "<leader>sd", ":SignifyDiff<CR>" },
+    { "<leader>sd",  ":SignifyDiff<CR>" },
-		{ "<leader>sn", ":lua signify_normal()<CR>" },
+    { "<leader>sn",  ":lua signify_normal()<CR>" },
-		{ "<leader>sup", ":lua signify_dtup()<CR>" },
+    { "<leader>sup", ":lua signify_dtup()<CR>" },
-		{ "<leader>sex", ":lua signify_dtex()<CR>" },
+    { "<leader>sex", ":lua signify_dtex()<CR>" },
-		{ "<leader>sp4", ":lua signify_dtp4()<CR>" },
+    { "<leader>sp4", ":lua signify_dtp4()<CR>" },
-	},
+    { "<leader>sb",  ":lua signify_dtp4()<CR>" },
-	config = function()
+  },
-		vim.g.signify_vcs_list = { "hg", "git" }
+  config = function()
-		local one_eighth = "▏"
+    vim.g.signify_vcs_list = { "hg", "git" }
-		local one_quarter = "▎"
+    vim.g.signify_disable_by_default = 0
-		local three_eighths = "▍"
+    -- vim.g.signify_number_highlight = 1
-		vim.g.signify_disable_by_default = 0
+    vim.g.signify_sign_show_count = 0
-		vim.g.signify_sign_add = one_quarter
+    local s = "▕"
-		vim.g.signify_sign_delete = one_quarter
+    vim.g.signify_sign_add = s
-		vim.g.signify_sign_change = one_quarter
+    vim.g.signify_sign_delete = s
-		local red = "#f8a6a0"
+    vim.g.signify_sign_change = s
-		vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cc9b8" })
+    vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cd9b8" })
-		vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#84cee3" })
+    vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#849ee3" })
-		vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = red })
+
-		vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = red })
+    local myred = "#f296a0"
-		vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = red })
+    vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = myred })
-		-- vim.cmd("highlight SignColumn ctermbg=NONE cterm=NONE guibg=NONE gui=NONE")
+    vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = myred })
-	end,
+    vim.api.nvim_set_hl(0, "SignifyLineDelete", { fg = myred })
+    vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = myred })
+  end,
 }

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

@@ -14,33 +14,24 @@ _G.search_cwd = function()
 	builtin.find_files({ cwd = utils.buffer_dir() })
 end
 
-_G.live_grep = function(search_dirs)
-	require("telescope.builtin").live_grep({
-		search_dirs = search_dirs,
-	})
-end
-
-_G.live_grep_cword = function(search_dirs)
-	require("telescope.builtin").live_grep({ search_dirs = search_dirs })
-end
-
 local function exe(cmd)
 	return vim.split(vim.fn.system(cmd), "\n")
 end
 
-function fig_modified()
+local function fig_modified()
-	return exe("hg pstatus -ma -n --no-status --template= | sort")
+	return exe("chg pstatus -ma -n --no-status --template= | sort")
 end
 
-function fig_all_modified()
+local function fig_all_modified()
-	return exe("hg status -ma -n --rev p4base --no-status --template= | sort")
+	return exe("chg 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>e",  ":lua search_cwd()<CR>",                                                                    desc = "Find Files in Buffer Directory" },
-  { "<leader>ts", require('telescope.builtin').live_grep },
+  { "<leader>tb", ":Telescope buffers<CR>" },
-  { "<leader>TS", function() require('telescope.builtin').live_grep { default_text = vim.fn.expand("<cword>") } end, },
+  -- { "<leader>ts", require('telescope.builtin').live_grep },
+  -- { "<leader>TS", function() require('telescope.builtin').live_grep { default_text = vim.fn.expand("<cword>") } end, },
   {
     "<leader>t.",
     function()
@@ -50,14 +41,13 @@ local keys = {
     ,
     desc = "Find Dotfiles"
   },
-  { "<leader>tc",  ":Telescope textcase<CR>",                           desc = "Text case" },
+  { "<leader>tC", ":Telescope textcase<CR>",                           desc = "Text case" },
-  { "<leader>tC",  ":CritiqueUnresolvedCommentsTelescope<CR>",          desc = "Critique unresolved comments" },
+  { "<leader>tc", ":CritiqueCommentsTelescope<CR>",                    desc = "Critique all comments" },
-  { "<leader>tca", ":CritiqueCommentsTelescope<CR>",                    desc = "Critique all comments" },
+  { "<leader>tg", ":Telescope git_files<CR>",                          desc = "Git Files" },
-  { "<leader>tg",  ":Telescope git_files<CR>",                          desc = "Git Files" },
+  { "<leader>tk", ":Telescope keymaps<CR>",                            desc = "Keymaps" },
-  { "<leader>tk",  ":Telescope keymaps<CR>",                            desc = "Keymaps" },
+  { "<leader>tn", ":Telescope notify<CR>",                             desc = "Notifications" },
-  { "<leader>tn",  ":Telescope notify<CR>",                             desc = "Notifications" },
+  { "<leader>tr", ":Telescope resume<CR>",                             desc = "Telescope Resume" },
-  { "<leader>tr",  ":Telescope resume<CR>",                             desc = "Telescope Resume" },
+  { "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
-  { "<leader>th",  ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
 }
 
 if use_google() then
@@ -123,9 +113,32 @@ return {
 			end
 		end,
 	},
+	{
+		"nvim-telescope/telescope-live-grep-args.nvim",
+		keys = {
+			{
+				"<leader>ts",
+				function()
+					require("telescope").extensions.live_grep_args.live_grep_args()
+				end,
+			},
+			{
+				"<leader>TS",
+				function()
+					require("telescope").extensions.live_grep_args.live_grep_args({
+						default_text = vim.fn.expand("<cword>"),
+					})
+				end,
+			},
+		},
+		config = function()
+			require("telescope").load_extension("live_grep_args")
+		end,
+	},
 	{
 		"nvim-telescope/telescope.nvim",
 		dependencies = {
+			"nvim-telescope/telescope-live-grep-args.nvim",
 			"mfussenegger/nvim-dap",
 			"smartpde/telescope-recent-files",
 			"rcarriga/nvim-dap-ui",
@@ -183,6 +196,18 @@ return {
 					codesearch = {
 						experimental = true, -- enable results from google3/experimental
 					},
+					     live_grep_args = {
+            auto_quoting = true, -- enable/disable auto-quoting
+            -- define mappings, e.g.
+            mappings = { -- extend mappings
+              i = {
+                ["<C-k>"] = require("telescope-live-grep-args.actions").quote_prompt(),
+                ["<C-i>"] = require("telescope-live-grep-args.actions").quote_prompt({ postfix = " --iglob " }),
+                -- freeze the current list and start a fuzzy search in the frozen list
+                ["<C-.>"] = require("telescope-live-grep-args.actions").to_fuzzy_refine,
+              },
+            },
+          },
 					recent_files = {
 						-- This function rewrites all file paths to the current workspace.
 						-- For example, if w2 is the current workspace, then

vim/.vim/lua/plugins/themes-personal.lua

@@ -1,10 +1,36 @@
 local use_google = require("utils").use_google
 
 return {
+	{
+		"squk/ableton.nvim",
+		lazy = false,
+		cond = not use_google(),
+		priority = 1000,
+		-- dir = "~/neovim-plugins/squk/ableton.nvim",
+		opts = {
+			variant = "cooler",
+		},
+		config = function()
+			vim.cmd("colorscheme ableton")
+		end,
+	},
+	{
+		"dgox16/oldworld.nvim",
+		lazy = false,
+		cond = not use_google(),
+		priority = 1000,
+		opts = {
+			variant = "cooler",
+		},
+		config = function()
+			-- vim.cmd("colorscheme oldworld")
+		end,
+	},
 	{
 		"bluz71/vim-moonfly-colors",
 		name = "moonfly",
-		cond = not use_google(),
+		-- cond = not use_google(),
+		cond = false,
 		lazy = false,
 		priority = 1000,
 		config = function()
@@ -26,11 +52,12 @@ return {
 				group = custom_highlight,
 			})
 
-			vim.cmd("colorscheme moonfly")
 			vim.g.moonflyCursorColor = true
 			vim.g.moonflyItalics = true
 			vim.g.moonflyUnderlineMatchParen = true
 			vim.g.moonflyVirtualTextColor = true
+
+			vim.cmd("colorscheme moonfly")
 		end,
 	},
 	-- {

vim/.vim/lua/plugins/themes-work.lua

@@ -1,97 +1,93 @@
 local use_google = require("utils").use_google
 
 return {
-	{
+  {
-		"ful1e5/onedark.nvim",
+    "ful1e5/onedark.nvim",
-		priority = 1000, -- make sure to load this before all the other start plugins
+    priority = 1000,         -- make sure to load this before all the other start plugins
-		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+    lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
-		cond = use_google(),
+    cond = use_google(),
-		config = function()
+    config = function()
-			-- require("onedark").setup()
+      -- require("onedark").setup()
-		end,
+    end,
-	},
+  },
-	{
+  {
-		"catppuccin/nvim",
+    "catppuccin/nvim",
-		name = "catppuccin",
+    name = "catppuccin",
-		priority = 1000, -- make sure to load this before all the other start plugins
+    priority = 1000,         -- make sure to load this before all the other start plugins
-		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+    lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
-		cond = use_google(),
+    cond = use_google(),
-		config = function()
+    config = function()
-			vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
+      vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
-			local colors = require("catppuccin.palettes").get_palette()
+      local colors = require("catppuccin.palettes").get_palette()
 
-			require("catppuccin").setup({
+      require("catppuccin").setup({
-				flavour = "mocha",
+        flavour = "mocha",
-				integrations = {
+        integrations = {
-					cmp = true,
+          cmp = true,
-					-- coc_nvim = false,
+          -- coc_nvim = false,
-					dashboard = true,
+          dashboard = true,
-					-- fern = false,
+          -- fern = false,
-					fidget = true,
+          fidget = true,
-					gitgutter = true,
+          gitgutter = true,
-					gitsigns = true,
+          gitsigns = true,
-					-- hop = false,
+          -- hop = false,
-					illuminate = true,
+          illuminate = true,
-					-- leap = false,
+          leap = false,
-					-- lightspeed = false,
+          -- lightspeed = false,
-					-- lsp_saga = false,
+          -- lsp_saga = false,
-					lsp_trouble = true,
+          lsp_trouble = true,
-					illuminate = {
+          mason = true,
-						enabled = true,
+          markdown = true,
-						-- lsp = false
+          -- neogit = false,
-					},
+          -- neotest = false,
-					mason = true,
+          neotree = true,
-					markdown = true,
+          notify = true,
-					-- neogit = false,
+          nvimtree = true,
-					-- neotest = false,
+          -- overseer = false,
-					neotree = true,
+          -- pounce = false,
-					notify = true,
+          symbols_outline = true,
-					nvimtree = true,
+          telescope = true,
-					-- overseer = false,
+          treesitter = true,
-					-- pounce = false,
+          treesitter_context = true,
-					symbols_outline = true,
+          -- ts_rainbow = false,
-					telescope = true,
+          -- vim_sneak = false,
-					treesitter = true,
+          -- vimwiki = false,
-					treesitter_context = true,
+          which_key = true,
-					-- ts_rainbow = false,
+          -- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
-					-- vim_sneak = false,
+          dap = true,
-					-- vimwiki = false,
+          dap_ui = true,
-					which_key = true,
+          indent_blankline = {
-					-- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
+            enabled = true,
-					dap = true,
+            colored_indent_levels = false,
-					dap_ui = true,
+          },
-					indent_blankline = {
+        },
-						enabled = true,
+        native_lsp = {
-						colored_indent_levels = false,
+          enabled = true,
-					},
+          virtual_text = {
-				},
+            errors = { "italic" },
-				native_lsp = {
+            hints = { "italic" },
-					enabled = true,
+            warnings = { "italic" },
-					virtual_text = {
+            information = { "italic" },
-						errors = { "italic" },
+          },
-						hints = { "italic" },
+          underlines = {
-						warnings = { "italic" },
+            errors = { "underline" },
-						information = { "italic" },
+            hints = { "underline" },
-					},
+            warnings = { "underline" },
-					underlines = {
+            information = { "underline" },
-						errors = { "underline" },
+          },
-						hints = { "underline" },
+          inlay_hints = {
-						warnings = { "underline" },
+            background = true,
-						information = { "underline" },
+          },
-					},
+        },
-					inlay_hints = {
+        custom_highlights = {
-						background = true,
+          -- Identifier = { fg = colors.lavender },
-					},
+          -- Statement = { fg = colors.rosewater },
-				},
+          -- Identifier = { fg = colors.sapphire },
-				custom_highlights = {
+          -- Function = { fg = colors.mauve },
-					-- Identifier = { fg = colors.lavender },
+        },
-					-- Statement = { fg = colors.rosewater },
+      })
-					-- Identifier = { fg = colors.sapphire },
-					-- Function = { fg = colors.mauve },
-				},
-			})
 
-			vim.api.nvim_command("colorscheme catppuccin")
+      vim.api.nvim_command("colorscheme catppuccin")
-		end,
+    end,
-	},
+  },
 }

vim/.vim/lua/plugins/tmux.lua

@@ -1,9 +1,9 @@
 return {
-    "preservim/vimux",
+  "preservim/vimux",
-    "tmux-plugins/vim-tmux",
+  "tmux-plugins/vim-tmux",
-    "christoomey/vim-tmux-navigator",
+  "christoomey/vim-tmux-navigator",
-    "whatyouhide/vim-tmux-syntax",
+  "whatyouhide/vim-tmux-syntax",
-    "tmux-plugins/vim-tmux-focus-events",
+  "tmux-plugins/vim-tmux-focus-events",
-    -- 'jabirali/vim-tmux-yank',
+  -- 'jabirali/vim-tmux-yank',
-    "skywind3000/asyncrun.vim",
+  "skywind3000/asyncrun.vim",
 }

vim/.vim/lua/utils.lua

@@ -1,102 +1,60 @@
 local M = {
-	use_google_cache = nil,
+  use_google_cache = nil,
-	flags = {
+  flags = { blink = true },
-		blink = true,
-	},
 }
 
 function M.exec(command, args)
-	local Job = require("plenary.job")
+  local Job = require("plenary.job")
-	local job = Job:new({
+  local job = Job:new({
-		command = command,
+    command = command,
-		args = args,
+    args = args,
-	})
+  })
-	job:sync()
+  job:sync()
-	job:wait()
+  job:wait()
-	return job:result()
+  return job:result()
 end
 
 function M.map(mode, lhs, rhs, opts)
-	local options = { noremap = true }
+  local options = { noremap = true }
-	if opts then
+  if opts then
-		options = vim.tbl_extend("force", options, opts)
+    options = vim.tbl_extend("force", options, opts)
-	end
+  end
-	-- vim.api.nvim_set_keymap(mode, lhs, rhs, options)
+  -- vim.api.nvim_set_keymap(mode, lhs, rhs, options)
-	vim.keymap.set(mode, lhs, rhs, options)
+  vim.keymap.set(mode, lhs, rhs, options)
 end
 
 function M.use_google()
-	if M.use_google_cache == nil then
+  if M.use_google_cache == nil then
-		M.use_google_cache = M.file_exists(os.getenv("HOME") .. "/use_google")
+    M.use_google_cache = M.file_exists(vim.env.HOME .. "/use_google")
-	end
+  end
-	return M.use_google_cache
+  return M.use_google_cache
 end
 
 function M.file_exists(name)
-	local f = io.open(name, "r")
+  local f = io.open(name, "r")
-	if f ~= nil then
+  if f ~= nil then
-		io.close(f)
+    io.close(f)
-		return true
+    return true
-	else
+  else
-		return false
+    return false
-	end
+  end
-end
-
-function M.dump(o)
-	if type(o) == "table" then
-		local s = "{ "
-		for k, v in pairs(o) do
-			if type(k) ~= "number" then
-				k = '"' .. k .. '"'
-			end
-			s = s .. "[" .. k .. "] = " .. M.dump(v) .. ","
-		end
-		return s .. "} "
-	else
-		return tostring(o)
-	end
-end
-
-function M.tprint(tbl, indent)
-	if not indent then
-		indent = 0
-	end
-	local toprint = string.rep(" ", indent) .. "{\r\n"
-	indent = indent + 2
-	for k, v in pairs(tbl) do
-		toprint = toprint .. string.rep(" ", indent)
-		if type(k) == "number" then
-			toprint = toprint .. "[" .. k .. "] = "
-		elseif type(k) == "string" then
-			toprint = toprint .. k .. "= "
-		end
-		if type(v) == "number" then
-			toprint = toprint .. v .. ",\r\n"
-		elseif type(v) == "string" then
-			toprint = toprint .. '"' .. v .. '",\r\n'
-		elseif type(v) == "table" then
-			toprint = toprint .. M.tprint(v, indent + 2) .. ",\r\n"
-		else
-			toprint = toprint .. '"' .. tostring(v) .. '",\r\n'
-		end
-	end
-	toprint = toprint .. string.rep(" ", indent - 2) .. "}"
-	return toprint
 end
 
 function M.log(message)
-	local log_file_path = vim.fn.expand("$HOME/nvim.log")
+  local log_file_path = vim.fn.expand("$HOME/nvim.log")
-	local log_file = io.open(log_file_path, "a")
+  local log_file = io.open(log_file_path, "a")
-	io.output(log_file)
+  io.output(log_file)
-	io.write(message .. "\n")
+  io.write(message .. "\n")
-	io.close(log_file)
+  io.close(log_file)
 end
 
 function M.TableConcat(t1, t2)
-	for i = 1, #t2 do
+  for i = 1, #t2 do
-		t1[#t1 + 1] = t2[i]
+    t1[#t1 + 1] = t2[i]
-	end
+  end
-	return t1
+  return t1
 end
 
+M.flags.blink = not M.use_google()
+
 return M

vim/.vim/prefs/leader.vim

@@ -15,7 +15,7 @@ map <leader>` ysiw`
 vmap <leader>` c`<C-R>"`<ESC>
 
 " --------- SEARCH MAPPINGS ---------
-" unhilight search
+" unhighlight search
 nnoremap <leader><space> :nohlsearch<CR>
 
 " --------- CLIPBOARD MAPPINGS ---------
@@ -46,4 +46,5 @@ nmap <leader>yf :let @+ = expand("%") \| let @" = expand("%")<cr>
 " replace currently selected text with default register
 " without yanking it
 vnoremap <leader>p "_dP
-nnoremap <leader><leader> :VimuxOpenRunner<cr> :VimuxRunCommand '!!'<cr> :call VimuxSendKeys("Enter")<cr>
+nnoremap <leader><leader> :VimuxZoomRunner<cr> :VimuxRunCommand '!!'<cr> :call VimuxSendKeys("Enter")<cr>
+nnoremap <leader>. :VimuxOpenRunner<cr> :VimuxRunCommand '!!'<cr> :call VimuxSendKeys("Enter")<cr>

vim/.vimrc

@@ -37,12 +37,6 @@ set hlsearch     " highlight matches
 set splitright     " Puts new vsplit windows to the right of the current
 set splitbelow     " Puts new split windows to the bottom of the current
 
-" When set to a negative number from -1 to -100 this is used as the
-" percentage of the window height.  Thus -50 scrolls half the window
-" height.
-set scrolljump=5   " Line to scroll when cursor leaves screen
-" set scrolloff=3    " Minimum lines to keep above and below cursor
-
 set shortmess=A " disable swapg
 set shortmess+=O
 set modifiable

zsh/.aliases.sh

@@ -1,7 +1,7 @@
 export ABBR_QUIET=1
 alias grep='grep --colour'
 # abbr cat='bat'
-alias ls='exa'
+# alias ls='exa'
 alias tmux='tmux -2'
 
 alias ..="cd .."

zsh/.bash_profile

@@ -26,3 +26,5 @@ fi
 
 if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
 . "$HOME/.cargo/env"
+
+ulimit -n 10240

zsh/.bash_profile.google

@@ -5,8 +5,11 @@ export ABBR_QUIET=1
 # ---------------
 export PATH=$PATH:/google/src/head/depot/google3/experimental/users/cnieves/util
 export PATH="${HOME}/.config/lsp/lua-language-server/bin:${PATH}"
-export GOROOT=/usr/lib/google-golang
+export PATH=$PATH:/${HOME}/nvim-linux-x86_64/bin/
 export PATH=$GOROOT/bin:$PATH
+
+export DUMMY_API_KEY="DUMMY_API_KEY"
+export GOROOT=/usr/lib/google-golang
 export JAVA_HOME=$(readlink -ne /usr/local/buildtools/java/jdk)
 export CARGO_NET_GIT_FETCH_WITH_CLI=true
 source ~/g3path.zsh
@@ -152,3 +155,9 @@ source /google/bin/releases/gmscore-tools/cli/prod/setup_prod_gms.sh
 abbr bq="blaze query"
 abbr br="blaze run"
 abbr bb="blaze build"
+
+function phenodb() {
+  adb shell sqlite3 /data/data/com.google.android.gms/databases/phenotype.db "'$*'"
+}
+
+export PHENOTYPE_PACKAGE_NAME="com.google.YOUR.PHENOTYPE.PACKAGE.NAME"

zsh/.p10k.zsh

@@ -30,7 +30,6 @@
 
   zmodload zsh/langinfo
   if [[ ${langinfo[CODESET]:-} != (utf|UTF)(-|)8 ]]; then
-    local LC_ALL=${${(@M)$(locale -a):#*.(utf|UTF)(-|)8}[1]:-en_US.UTF-8}
   fi
 
   # The list of segments shown on the left. Fill it with the most important segments.

zsh/.zshrc

@@ -37,6 +37,7 @@ zplug "zsh-users/zsh-syntax-highlighting", defer:2
 zplug "mafredri/zsh-async", from:"github", use:"async.zsh"
 zplug "zsh-users/zsh-autosuggestions"
 zplug "zsh-users/zsh-history-substring-search"
+zplug 'joshskidmore/zsh-fzf-history-search'
 zplug "modules/command-not-found", from:prezto
 zplug "romkatv/powerlevel10k", as:theme, depth:1
 
@@ -77,7 +78,7 @@ fi
 
 zle -N fancy-ctrl-z
 bindkey '^Z' fancy-ctrl-z
-bindkey '^R' fzf-history-widget
+# bindkey '^R' fzf-history-widget
 bindkey "^A" beginning-of-line
 bindkey "^E" end-of-line
 bindkey '\eK' kill-line
@@ -158,12 +159,13 @@ autoload -Uz add-zsh-hook
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 export EDITOR='nvim'
+export PATH="$PATH:/opt/nvim/"
 export TERM=xterm-256color
-export LANG="en_US.UTF-8"
+
-export LC_ALL="en_US.UTF-8"
+export CARGO_NET_GIT_FETCH_WITH_CLI=true
-export LC_CTYPE="en_US.UTF-8"
+
-export LANG_ALL="en_US.UTF-8"
 
 source ~/.bash_profile
+export RIPGREP_CONFIG_PATH=$HOME/.ripgreprc
 
 export PATH="$HOME/.local/bin:$PATH"

zsh/g3path.zsh

@@ -13,7 +13,7 @@ autoload -Uz add-zsh-hook
 add-zsh-hook chpwd g3path::hook
 
 g3path::zle::accept-line () {
-  if [[ -n $GOOGLE3_ROOT && ! $BUFFER =~ \\s*(bb|bq|br|blaze|g4|p4|g4d|add_dep|buildozer|build_cleaner|debug_android_lint|rabbit|hb|gqui|builddoctor|unused_deps|clipper|blaze_lint_refactoring|migrants_sh.sar) ]]; then
+  if [[ -n $GOOGLE3_ROOT && ! $BUFFER =~ \\s*(bb|bq|br|blaze|g4|p4|g4d|add_dep|buildozer|build_cleaner|debug_android_lint|rabbit|hb|gqui|builddoctor|unused_deps|clipper|blaze_lint_refactoring|migrants_sh.sar|bloaty) ]]; then
     BUFFER=${BUFFER// \/\// $GOOGLE3_ROOT\/}
   fi
   zle .accept-line