fix conform

alacritty/.alacritty.toml

@@ -0,0 +1,49 @@
+[font]
+size = 14
+normal = { family = "CommitMono Nerd Font" }
+
+[window]
+option_as_alt = "OnlyLeft"
+decorations = "None"
+
+# moonfly theme for Alacritty
+#
+# Upstream: github.com/bluz71/vim-moonfly-colors
+
+[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 = '#353539'
+blue = '#a7b3dd'
+cyan = '#6de6fc'
+green = '#a8fc8d'
+magenta = '#eb4cce'
+red = '#ca72de'
+white = '#c9c7cd'
+yellow = '#f7f48d'
+
+[colors.cursor]
+cursor = "#8e8e8e"
+text = "#080808"
+
+[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

@@ -0,0 +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({
+		"git",
+		"clone",
+		"--filter=blob:none",
+		"https://github.com/folke/lazy.nvim.git",
+		lazypath,
+	})
+end
+vim.opt.rtp:prepend(lazypath)
+vim.opt.rtp:prepend(vim.env.HOME .. "/.vim")
+local luahome = vim.env.HOME .. "/.vim/lua"
+vim.opt.rtp:prepend(luahome)
+
+package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua"
+
+for _, file in ipairs(vim.fn.readdir(luahome .. "/config", [[v:val =~ '\.lua$']])) do
+	require("config" .. "." .. file:gsub("%.lua$", ""))
+end
+
+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/init.vim

@@ -1 +0,0 @@
-source ~/.vimrc

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

@@ -1,112 +1,133 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" },
+  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "actions-preview.nvim": { "branch": "master", "commit": "9e86d014a72a4121ee27f3d8952e1ea868c3c8c4" },
+  "actions-preview.nvim": { "branch": "master", "commit": "36513ad213855d497b7dd3391a24d1d75d58e36f" },
-  "aerial.nvim": { "branch": "master", "commit": "3748e87a316a68754341cdffcef44fee61dee51c" },
+  "aerial.nvim": { "branch": "master", "commit": "2e00d1d4248f08dddfceacb8d2996e51e13e00f6" },
-  "ai.nvim": { "branch": "main", "commit": "7fce571d1efe34fb41989a899efe0c57e13111a3" },
+  "ai.nvim": { "branch": "main", "commit": "f042afc07d2815aa7aef9d1d8bd7e6f4f4957296" },
-  "asyncrun.vim": { "branch": "master", "commit": "61cc3081963a12048e00e89f8cedc8bd1cb83b8c" },
+  "asyncrun.vim": { "branch": "master", "commit": "e17c49c67d1dd847cd1d7d6077a7168816f546cc" },
-  "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" },
+  "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": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" },
+  "cmp-calc": { "branch": "main", "commit": "5947b412da67306c5b68698a02a846760059be2e" },
-  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
+  "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
   "cmp-cmdline-history": { "branch": "master", "commit": "003573b72d4635ce636234a826fa8c4ba2895ffe" },
-  "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
+  "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
-  "cmp-nerdfont": { "branch": "main", "commit": "a3b7c0cadb7bd389f513eecda376d4c6bec90003" },
+  "cmp-nerdfont": { "branch": "main", "commit": "e97482344ebed29093015a18c155057adf5c842b" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-ciderlsp": { "branch": "main", "commit": "58faf9323bcbb5358d820d3fa7f5d0b4c0608b62" },
-  "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
+  "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": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
+  "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
-  "cmp-treesitter": { "branch": "master", "commit": "13e4ef8f4dd5639fca2eb9150e68f47639a9b37d" },
+  "cmp-treesitter": { "branch": "master", "commit": "958fcfa0d8ce46d215e19cc3992c542f576c4123" },
   "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+  "conflict-marker.vim": { "branch": "master", "commit": "62742b2ffe7a433988759c67b5c5a22eff74a14b" },
-  "codeium.nvim": { "branch": "main", "commit": "f871000e91faa9ed334da2bfa4eadbf54d0e1047" },
+  "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" },
-  "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
+  "copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" },
-  "conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" },
+  "crates.nvim": { "branch": "main", "commit": "2c8f4fab02e3e9ea42c6ad9b547e4207a914a397" },
-  "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
+  "dashboard-nvim": { "branch": "master", "commit": "591b5b29e2f17b97496ec3179f6ecd08bb8502cc" },
-  "dashboard-nvim": { "branch": "master", "commit": "7514748c7de7c78fac4a4c13f2c670b54f2c27ff" },
+  "debugprint.nvim": { "branch": "main", "commit": "196d33d4026436f7eddc67136e98515d62259947" },
-  "debugprint.nvim": { "branch": "main", "commit": "0c81cd2bab372bba99815f505eb1fe759d38dd88" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dropbar.nvim": { "branch": "master", "commit": "79847a78ec0c58f5e5c0360192b03d0cee803e95" },
+  "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
-  "ferris.nvim": { "branch": "main", "commit": "52e39c017f511e8cf9a024022d48164bfbfe52ee" },
+  "firenvim": { "branch": "master", "commit": "c4ab7d2aeb145cd93db8660cb134f771722f2b5e" },
-  "firenvim": { "branch": "master", "commit": "f2dd6d3bcf3309a7dd30c79b3b3c03ab55cea6e2" },
+  "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
-  "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
+  "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": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" },
+  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
-  "go.nvim": { "branch": "master", "commit": "096f65692034022c963b55f493961a8a1d861ba4" },
+  "go.nvim": { "branch": "master", "commit": "fbceaf55e18e9e473f289df008d6b508a479fbf8" },
-  "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" },
+  "googlepaths.nvim": { "branch": "main", "commit": "53439c17178049096809b4fb963e75440b86ad78" },
-  "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
+  "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": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lazygit.nvim": { "branch": "main", "commit": "1e08e3f5ac1152339690140e61a4a32b3bdc7de5" },
+  "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
-  "leap.nvim": { "branch": "main", "commit": "46e9b1a1d7438ac72794b0857b20cad4390b827c" },
+  "lazygit.nvim": { "branch": "main", "commit": "b9eae3badab982e71abab96d3ee1d258f0c07961" },
+  "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lsp-timeout.nvim": { "branch": "main", "commit": "6325906730330105a9adc41d0ceb8499b3072e2b" },
+  "lsp-zero.nvim": { "branch": "v4.x", "commit": "2afa32e732d7b36e80cd5241fbdc4a38e123c4e0" },
-  "lsp-virtual-improved.nvim": { "branch": "master", "commit": "db9cd544b7febdf4c48374e351b3903143b4477d" },
+  "lsp_lines.nvim": { "branch": "main", "commit": "3b57922d2d79762e6baedaf9d66d8ba71f822816" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "abac76482ec3012a2b359ba956a74e2ffd33d46f" },
+  "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
-  "lsp_lines.nvim": { "branch": "main", "commit": "dbfd8e96ec2696e1ceedcd23fd70e842256e3dea" },
+  "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "529e8861d0410389f0163a5e5c2199d4a4ef5bf6" },
+  "luasnip-google.nvim": { "branch": "main", "commit": "86df31e12350c15e207fcbc255d951144bb6d0b5" },
-  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
+  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
+  "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
-  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
+  "mini.notify": { "branch": "main", "commit": "3a06b21dd0b335b95d125eae813276113b5e9ce7" },
-  "mini.icons": { "branch": "main", "commit": "972fd138fe204dc1e9807cd1004cf851e32daf4b" },
+  "mini.pick": { "branch": "main", "commit": "417c273861971b451687e847383e61687463b06e" },
+  "minuet-ai.nvim": { "branch": "main", "commit": "fb1616faaf4af1c6a4ac6952d9e73833206600a5" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
-  "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
+  "neo-tree.nvim": { "branch": "main", "commit": "71bfdeddc90225e281ce34c378dc1b5914f5018d" },
-  "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" },
+  "neovim-throttle-debounce": { "branch": "main", "commit": "f6bf97fa0dc704affc8149aeaef5ef0cafa4d10c" },
-  "neogen": { "branch": "main", "commit": "6de0add4805165317ab7d3d36b5cef48b1b865f3" },
+  "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" },
-  "neoscopes": { "branch": "main", "commit": "470dff042004b93c10d262e8b0ad7bf6f703f86f" },
+  "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nightfox.nvim": { "branch": "main", "commit": "a408e6bb101066952b81de9c11be367114bd561f" },
-  "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
-  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
   "nvim-cmp-buffer-lines": { "branch": "master", "commit": "924ccc04dc5c919b6baa05d45818025baa82699a" },
-  "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
+  "nvim-colorizer.lua": { "branch": "master", "commit": "517df88cf2afb36652830df2c655df2da416a0ae" },
-  "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" },
+  "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" },
-  "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
+  "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "d7c695ea39542f6da94ee4d66176f5d660ab0a77" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
-  "nvim-jdtls": { "branch": "master", "commit": "4f4de4d80e1df43d58e5e21677fca4c63676664d" },
+  "nvim-jdtls": { "branch": "master", "commit": "c23f200fee469a415c77265ca55b496feb646992" },
-  "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
+  "nvim-lightbulb": { "branch": "master", "commit": "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49" },
-  "nvim-lint": { "branch": "master", "commit": "985ce08212551f6c5d661ce00d7e1e38aa22f51e" },
+  "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" },
-  "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "37cc31c64d657feff6f752a1bf15f584d4734eca" },
-  "nvim-luapad": { "branch": "master", "commit": "a5b3d6aa1fe5fe75e6124927392a9d3a60a0ecce" },
+  "nvim-luapad": { "branch": "master", "commit": "176686eb616a5ada5dfc748f2b5109194bbe8a71" },
-  "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
+  "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" },
-  "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
+  "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },
-  "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
+  "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" },
-  "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" },
+  "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" },
-  "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" },
+  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "ec1a2431f8872f650a85ed71c24f0715df2e49c2" },
-  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4be2e8689067494ed7e5a4f1221adc31d1a07783" },
+  "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" },
-  "persistence.nvim": { "branch": "main", "commit": "5fe077056c821aab41f87650bd6e1c48cd7dd047" },
+  "paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" },
-  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
+  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
+  "refactoring.nvim": { "branch": "master", "commit": "2be7ea3f10b7e59658f5abf6dffc50b5d61964d6" },
-  "refactoring.nvim": { "branch": "master", "commit": "fb4990a0546c59136930ea624b8640d07957f281" },
+  "ron.vim": { "branch": "master", "commit": "f749e543975a82e8dd9a6e7df9600a1c098ae800" },
-  "rustaceanvim": { "branch": "master", "commit": "bc8c4b8f7606d5b7c067cd8369e25c1a7ff77bd0" },
+  "rustaceanvim": { "branch": "master", "commit": "3f2b7a94b7fa3c0f301dfa9644c94b543000efc2" },
-  "sonokai": { "branch": "master", "commit": "bdce098fc9e7202d3c555e2dc98c755ca1c23835" },
   "tagalong.vim": { "branch": "main", "commit": "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3" },
-  "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
+  "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "telescope-import.nvim": { "branch": "main", "commit": "6fd69447679a99b463025e7f2f787e8b185dd740" },
-  "telescope-import.nvim": { "branch": "main", "commit": "08e31708451b43d1ef766d370d5ef17e9f0c24ae" },
+  "telescope-live-grep-args.nvim": { "branch": "master", "commit": "b80ec2c70ec4f32571478b501218c8979fab5201" },
-  "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" },
+  "telescope-recent-files": { "branch": "main", "commit": "eb190c0baded1cbfa9d8767c817b054377683163" },
-  "text-case.nvim": { "branch": "main", "commit": "6bc91cde614bbec6f0befbaf7fcd302415d803fb" },
+  "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" },
-  "tree-sitter-gdscript": { "branch": "master", "commit": "03f20b94707a21bed90bb95101684bc4036139ce" },
+  "telescope_citc": { "branch": "main", "commit": "61df86dc218198a730e27bafd33535dac8539dcf" },
-  "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
+  "telescope_codesearch": { "branch": "main", "commit": "4c6ad26b1b0a7db6f5de8f0a619a105f93bf63f3" },
-  "undotree": { "branch": "master", "commit": "7df3be7a261ea31b528aa442b494fcb458f3d968" },
+  "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": "029f35c783f1b504f9be086b9ea757a36059c846" },
+  "vim-better-whitespace": { "branch": "master", "commit": "86a0579b330b133b8181b8e088943e81c26a809e" },
   "vim-conjoin": { "branch": "master", "commit": "2ea3b8ed994d12bbf255825d973d865621c64860" },
-  "vim-floaterm": { "branch": "master", "commit": "97c085b2f69e931ed78bb1c260512d1e0492a754" },
+  "vim-floaterm": { "branch": "master", "commit": "204a01a3868cbe4549640dca857fb3880ee92b17" },
-  "vim-godot": { "branch": "master", "commit": "d748a46be5195256f6b2c767ef32de87b05ae8f7" },
+  "vim-glsl": { "branch": "master", "commit": "40dd0b143ef93f3930a8a409f60c1bb85e28b727" },
-  "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
+  "vim-illuminate": { "branch": "master", "commit": "fbc16dee336d8cc0d3d2382ea4a53f4a29725abf" },
+  "vim-imp": { "branch": "main", "commit": "87d5725e065a76d89aa52889ee8804e723d16e14" },
   "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
-  "vim-matchup": { "branch": "master", "commit": "7f81ae12542b2a35819f0324895df9bd8626c8ba" },
+  "vim-matchup": { "branch": "master", "commit": "ea2ff43e09e68b63fc6d9268fc5d82d82d433cb3" },
-  "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" },
+  "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": "38b1d0402c4600543281dc85b3f51884205674b6" },
+  "vim-tmux-navigator": { "branch": "master", "commit": "33afa80db65113561dc53fa732b7f5e53d5ecfd0" },
   "vim-tmux-syntax": { "branch": "master", "commit": "1b6a6a5beb96fa232c8d35d305f77496b12678a9" },
-  "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" },
+  "vimux": { "branch": "master", "commit": "7db6b2f79d432ee3820668b1d4625311dbe1d0ad" },
-  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
+  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
   "yankwin.vim": { "branch": "master", "commit": "d3e3bbb0f785115c2f24b44ddf12e9378a1c1266" },
-  "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }
+  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
-}
+}

config/.config/nvim/spell/en.utf-8.add

@@ -8,3 +8,4 @@ collsion_body
 shake_decay
 index
 func/!
+lookup_app_pointer_handle/!

config/.config/nvim/syntax/gotmpl.vim

@@ -0,0 +1,83 @@
+" Copyright 2011 The Go Authors. All rights reserved.
+" Use of this source code is governed by a BSD-style
+" license that can be found in the LICENSE file.
+"
+" gotpl.vim: Vim syntax file for Go templates.
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" Go escapes
+syn match       goEscapeOctal       display contained "\\[0-7]\{3}"
+syn match       goEscapeC           display contained +\\[abfnrtv\\'"]+
+syn match       goEscapeX           display contained "\\x\x\{2}"
+syn match       goEscapeU           display contained "\\u\x\{4}"
+syn match       goEscapeBigU        display contained "\\U\x\{8}"
+syn match       goEscapeError       display contained +\\[^0-7xuUabfnrtv\\'"]+
+
+hi def link     goEscapeOctal       goSpecialString
+hi def link     goEscapeC           goSpecialString
+hi def link     goEscapeX           goSpecialString
+hi def link     goEscapeU           goSpecialString
+hi def link     goEscapeBigU        goSpecialString
+hi def link     goSpecialString     Special
+hi def link     goEscapeError       Error
+
+" Strings and their contents
+syn cluster     goStringGroup       contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
+syn region      goString            contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
+syn region      goRawString         contained start=+`+ end=+`+
+
+hi def link     goString            String
+hi def link     goRawString         String
+
+" Characters; their contents
+syn cluster     goCharacterGroup    contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
+syn region      goCharacter         start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@goCharacterGroup
+
+hi def link     goCharacter         Character
+
+" Integers
+syn match       goDecimalInt        contained "\<\d\+\([Ee]\d\+\)\?\>"
+syn match       goHexadecimalInt    contained "\<0x\x\+\>"
+syn match       goOctalInt          contained "\<0\o\+\>"
+syn match       goOctalError        contained "\<0\o*[89]\d*\>"
+syn cluster     goInt               contains=goDecimalInt,goHexadecimalInt,goOctalInt
+" Floating point
+syn match       goFloat             contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             contained "\<\.\d\+\([Ee][-+]\d\+\)\?\>"
+syn match       goFloat             contained "\<\d\+[Ee][-+]\d\+\>"
+" Imaginary literals
+syn match       goImaginary         contained "\<\d\+i\>"
+syn match       goImaginary         contained "\<\d\+\.\d*\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         contained "\<\.\d\+\([Ee][-+]\d\+\)\?i\>"
+syn match       goImaginary         contained "\<\d\+[Ee][-+]\d\+i\>"
+
+hi def link     goInt        Number
+hi def link     goFloat      Number
+hi def link     goImaginary  Number
+
+" Token groups
+syn cluster     gotplLiteral     contains=goString,goRawString,goCharacter,@goInt,goFloat,goImaginary
+syn keyword     gotplControl     contained   if else end range with template
+syn keyword     gotplFunctions   contained   and html index js len not or print printf println urlquery eq ne lt le gt ge
+syn match       gotplVariable    contained   /\$[^ ]*\>/
+syn match       goTplIdentifier  contained   /\.[^ ]*\>/
+
+hi def link     gotplControl        Keyword
+hi def link     gotplFunctions      Function
+hi def link     goTplVariable       Special
+
+syn region gotplAction start="{{" end="}}" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable,goTplIdentifier display
+syn region gotplAction start="\[\[" end="\]\]" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable display
+syn region goTplComment start="{{/\*" end="\*/}}" display
+syn region goTplComment start="\[\[/\*" end="\*/\]\]" display
+
+hi def link gotplAction PreProc
+hi def link goTplComment Comment
+
+let b:current_syntax = "gotmpl"

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

@@ -0,0 +1,9 @@
+abbr "allpaths"="blaze query \"allpaths(%, %)\" --output graph | /google/data/ro/projects/graphviz-server/graphviz"
+abbr "bb"="blaze build"
+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,17 +34,69 @@
     la = "!git config -l | grep alias | cut -c 7-"
     po = push origin
 [core]
-	autocrlf = false
+    autocrlf = false
+    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

git/.gitignore_global

@@ -0,0 +1,19 @@
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so

google/.alacritty.toml

@@ -0,0 +1,73 @@
+[font]
+size = 12
+normal = { family = "ComicCodeLigatures Nerd Font Light" }
+
+[window]
+option_as_alt = "OnlyLeft"
+decorations = "None"
+
+[colors.primary]
+background = "#24273a"
+foreground = "#cad3f5"
+dim_foreground = "#8087a2"
+bright_foreground = "#cad3f5"
+
+[colors.cursor]
+text = "#24273a"
+cursor = "#f4dbd6"
+
+[colors.vi_mode_cursor]
+text = "#24273a"
+cursor = "#b7bdf8"
+
+[colors.search.matches]
+foreground = "#24273a"
+background = "#a5adcb"
+
+[colors.search.focused_match]
+foreground = "#24273a"
+background = "#a6da95"
+
+[colors.footer_bar]
+foreground = "#24273a"
+background = "#a5adcb"
+
+[colors.hints.start]
+foreground = "#24273a"
+background = "#eed49f"
+
+[colors.hints.end]
+foreground = "#24273a"
+background = "#a5adcb"
+
+[colors.selection]
+text = "#24273a"
+background = "#f4dbd6"
+
+[colors.normal]
+black = "#494d64"
+red = "#ed8796"
+green = "#a6da95"
+yellow = "#eed49f"
+blue = "#8aadf4"
+magenta = "#f5bde6"
+cyan = "#8bd5ca"
+white = "#b8c0e0"
+
+[colors.bright]
+black = "#5b6078"
+red = "#ed8796"
+green = "#a6da95"
+yellow = "#eed49f"
+blue = "#8aadf4"
+magenta = "#f5bde6"
+cyan = "#8bd5ca"
+white = "#a5adcb"
+
+[[colors.indexed_colors]]
+index = 16
+color = "#f5a97f"
+
+[[colors.indexed_colors]]
+index = 17
+color = "#f4dbd6"

google/.blazerc

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

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/blaze.lua

@@ -1,7 +0,0 @@
-vim.cmd([[
-function UnusedDeps() abort
-    exe VimuxRunCommand("unused_deps --nouse_build_api --blaze_options='--config=gmscore_tap' " . join(blaze#GetTargets(), ' '))
-endfunction
-
-nnoremap <Leader>ud :call UnusedDeps()<cr>
-]])

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/fig.lua

@@ -1,30 +0,0 @@
-local map = require("utils").map
-local use_google = require("utils").use_google
-
-if use_google() then
-	-- [F]ig [S]tatus
-	map("n", "<leader>fs", [[<cmd>lua require('telescope').extensions.fig.status{}<CR>]])
-
-	-- [F]ig [X]l
-	map("n", "<leader>fx", [[<cmd>lua require('telescope').extensions.fig.xl{}<CR>]])
-
-	-- [F]ig [W]hatsout
-	map("n", "<leader>fw", [[<cmd>lua require('telescope').extensions.fig.status{whatsout=true}<CR>]])
-
-	-- [F]ig [A]mend
-	map("n", "<leader>fa", [[<cmd>Hg amend<CR>]])
-
-	-- [F]ig [A]mend
-	map("n", "<leader>fe", [[<cmd>Hg evolve<CR>]])
-
-	-- [F]ig [N]ext
-	map("n", "<leader>fn", [[<cmd>Hg next<CR>]])
-	--
-	-- [F]ig [P]rev
-	map("n", "<leader>fp", [[<cmd>Hg prev<CR>]])
-	--
-	-- [F]ig [U]pload
-	map("n", "<leader>fu", [[<cmd>Hg upload tree<CR>]])
-
-	-- map('n', '<Leader>f', ':Figtree<CR>', { silent = true })
-end

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

@@ -1,109 +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 = lspconfig.util.root_pattern("google3/*BUILD"),
-				settings = {},
-			},
-		}
-
-		-- configs.analysislsp = {
-		-- 	default_config = {
-		-- 		cmd = {
-		-- 			"/google/bin/users/lerm/glint-ale/analysis_lsp/server",
-		-- 			"--lint_on_save=false",
-		-- 			"--max_qps=10",
-		-- 		},
-		-- 		filetypes = {
-		-- 			"c",
-		-- 			"cpp",
-		-- 			"java",
-		-- 			"kotlin",
-		-- 			"objc",
-		-- 			"proto",
-		-- 			"textproto",
-		-- 			"go",
-		-- 			"python",
-		-- 			"bzl",
-		-- 			-- "markdown",
-		-- 			"typescript",
-		-- 			"javascript",
-		-- 		},
-		-- 		root_dir = function(fname)
-		-- 			return string.match(fname, "(/google/src/cloud/[%w_-]+/[%w_-]+/google3/).+$")
-		-- 		end,
-		-- 		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", "info")
-				require("lualine").refresh()
-			end
-		end
-
-		lspconfig.ciderlsp.setup({
-			gapabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities()),
-			on_attach = cider_on_attach,
-			handlers = cider_lsp_handlers,
-		})
-		-- lspconfig.analysislsp.setup({
-		-- 	capabilities = capabilities,
-		-- })
-	end
-end
-
-return M

vim/.vim/lua/config/nerdcommenter.lua

@@ -1,24 +0,0 @@
---------- NERD Commenter
--- Create default mappings
-vim.g.NERDCreateDefaultMappings = 0
-
--- Add spaces after comment delimiters by default
-vim.g.NERDSpaceDelims = 1
-
--- Use compact syntax for prettified multi-line comments
-vim.g.NERDCompactSexyComs = 1
-
--- Align line-wise comment delimiters flush left instead of following code indentation
-vim.g.NERDDefaultAlign = "left"
-
--- Set a language to use its alternate delimiters by default
-vim.g.NERDAltDelims_java = 1
-
--- Allow commenting and inverting empty lines (useful when commenting a region)
-vim.g.NERDCommentEmptyLines = 1
-
--- Enable trimming of trailing whitespace when uncommenting
-vim.g.NERDTrimTrailingWhitespace = 1
-
---Enable NERDCommenterToggle to check all selected lines is commented or not
-vim.g.NERDToggleCheckAllLines = 1

vim/.vim/lua/config/nvim-tree.lua

@@ -1,75 +0,0 @@
-local map = require("utils").map
-
-local api = require("nvim-tree.api")
-
-local function opts(desc)
-	return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true }
-end
-
-function on_attach(bufnr)
-	vim.keymap.set("n", "O", api.tree.change_root_to_node, opts("CD"))
-	vim.keymap.set("n", "?", api.tree.toggle_help, opts("Help"))
-
-	-- put some default mappings here
-	vim.keymap.set("n", "<C-e>", api.node.open.replace_tree_buffer, opts("Open: In Place"))
-	vim.keymap.set("n", "<C-k>", api.node.show_info_popup, opts("Info"))
-	vim.keymap.set("n", "<C-r>", api.fs.rename_sub, opts("Rename: Omit Filename"))
-	vim.keymap.set("n", "<C-t>", api.node.open.tab, opts("Open: New Tab"))
-	vim.keymap.set("n", "<C-v>", api.node.open.vertical, opts("Open: Vertical Split"))
-	vim.keymap.set("n", "<C-x>", api.node.open.horizontal, opts("Open: Horizontal Split"))
-	vim.keymap.set("n", "<BS>", api.node.navigate.parent_close, opts("Close Directory"))
-	vim.keymap.set("n", "<CR>", api.node.open.edit, opts("Open"))
-	vim.keymap.set("n", "<Tab>", api.node.open.preview, opts("Open Preview"))
-	vim.keymap.set("n", ">", api.node.navigate.sibling.next, opts("Next Sibling"))
-	vim.keymap.set("n", "<", api.node.navigate.sibling.prev, opts("Previous Sibling"))
-	vim.keymap.set("n", ".", api.node.run.cmd, opts("Run Command"))
-	vim.keymap.set("n", "-", api.tree.change_root_to_parent, opts("Up"))
-	vim.keymap.set("n", "a", api.fs.create, opts("Create"))
-	vim.keymap.set("n", "bmv", api.marks.bulk.move, opts("Move Bookmarked"))
-	vim.keymap.set("n", "B", api.tree.toggle_no_buffer_filter, opts("Toggle No Buffer"))
-	vim.keymap.set("n", "c", api.fs.copy.node, opts("Copy"))
-	-- vim.keymap.set('n', 'C',     api.tree.toggle_git_clean_filter,      opts('Toggle Git Clean'))
-	-- vim.keymap.set('n', '[c',    api.node.navigate.git.prev,            opts('Prev Git'))
-	-- vim.keymap.set('n', ']c',    api.node.navigate.git.next,            opts('Next Git'))
-	vim.keymap.set("n", "d", api.fs.remove, opts("Delete"))
-	vim.keymap.set("n", "D", api.fs.trash, opts("Trash"))
-	vim.keymap.set("n", "E", api.tree.expand_all, opts("Expand All"))
-	vim.keymap.set("n", "e", api.fs.rename_basename, opts("Rename: Basename"))
-	vim.keymap.set("n", "]e", api.node.navigate.diagnostics.next, opts("Next Diagnostic"))
-	vim.keymap.set("n", "[e", api.node.navigate.diagnostics.prev, opts("Prev Diagnostic"))
-	vim.keymap.set("n", "F", api.live_filter.clear, opts("Clean Filter"))
-	vim.keymap.set("n", "f", api.live_filter.start, opts("Filter"))
-	vim.keymap.set("n", "g?", api.tree.toggle_help, opts("Help"))
-	vim.keymap.set("n", "gy", api.fs.copy.absolute_path, opts("Copy Absolute Path"))
-	vim.keymap.set("n", "H", api.tree.toggle_hidden_filter, opts("Toggle Dotfiles"))
-	vim.keymap.set("n", "I", api.tree.toggle_gitignore_filter, opts("Toggle Git Ignore"))
-	vim.keymap.set("n", "J", api.node.navigate.sibling.last, opts("Last Sibling"))
-	vim.keymap.set("n", "K", api.node.navigate.sibling.first, opts("First Sibling"))
-	vim.keymap.set("n", "m", api.marks.toggle, opts("Toggle Bookmark"))
-	vim.keymap.set("n", "o", api.node.open.edit, opts("Open"))
-	-- vim.keymap.set('n', 'O',     api.node.open.no_window_picker,        opts('Open: No Window Picker'))
-	vim.keymap.set("n", "p", api.fs.paste, opts("Paste"))
-	vim.keymap.set("n", "P", api.node.navigate.parent, opts("Parent Directory"))
-	vim.keymap.set("n", "q", api.tree.close, opts("Close"))
-	vim.keymap.set("n", "r", api.fs.rename, opts("Rename"))
-	vim.keymap.set("n", "R", api.tree.reload, opts("Refresh"))
-	vim.keymap.set("n", "s", api.node.run.system, opts("Run System"))
-	vim.keymap.set("n", "S", api.tree.search_node, opts("Search"))
-	vim.keymap.set("n", "U", api.tree.toggle_custom_filter, opts("Toggle Hidden"))
-	vim.keymap.set("n", "W", api.tree.collapse_all, opts("Collapse"))
-	vim.keymap.set("n", "x", api.fs.cut, opts("Cut"))
-	vim.keymap.set("n", "y", api.fs.copy.filename, opts("Copy Name"))
-	vim.keymap.set("n", "Y", api.fs.copy.relative_path, opts("Copy Relative Path"))
-end
-
-require("nvim-tree").setup({
-	on_attach = on_attach,
-	update_focused_file = {
-		enable = true,
-		update_root = false,
-		ignore_list = {},
-	},
-})
-
-map("n", "<C-T>", ":NvimTreeToggle<CR>")
-map("n", "<C-F>", ":NvimTreeFindFileToggle<CR>")

vim/.vim/lua/config/refactoring.lua

@@ -1,66 +0,0 @@
-require("refactoring").setup({})
-
--- load refactoring Telescope extension
-require("telescope").load_extension("refactoring")
-
--- remap to open the Telescope refactoring menu in visual mode
-vim.api.nvim_set_keymap(
-	"v",
-	"<leader>rr",
-	"<Esc><cmd>lua require('telescope').extensions.refactoring.refactors()<CR>",
-	{ noremap = true }
-)
-
--- Remaps for the refactoring operations currently offered by the plugin
-vim.api.nvim_set_keymap(
-	"v",
-	"<leader>rx",
-	[[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function')<CR>]],
-	{ noremap = true, silent = true, expr = false }
-)
-vim.api.nvim_set_keymap(
-	"v",
-	"<leader>rxf",
-	[[ <Esc><Cmd>lua require('refactoring').refactor('Extract Function To File')<CR>]],
-	{ noremap = true, silent = true, expr = false }
-)
-vim.api.nvim_set_keymap(
-	"v",
-	"<leader>rxv",
-	[[ <Esc><Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]],
-	{ noremap = true, silent = true, expr = false }
-)
-vim.api.nvim_set_keymap(
-	"v",
-	"<leader>ri",
-	[[ <Esc><Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]],
-	{ noremap = true, silent = true, expr = false }
-)
-
--- Extract block doesn't need visual mode
-vim.api.nvim_set_keymap(
-	"n",
-	"<leader>rxb",
-	[[ <Cmd>lua require('refactoring').refactor('Extract Block')<CR>]],
-	{ noremap = true, silent = true, expr = false }
-)
-vim.api.nvim_set_keymap(
-	"n",
-	"<leader>rxbf",
-	[[ <Cmd>lua require('refactoring').refactor('Extract Block To File')<CR>]],
-	{ noremap = true, silent = true, expr = false }
-)
-
--- Inline variable can also pick up the identifier currently under the cursor without visual mode
-vim.api.nvim_set_keymap(
-	"n",
-	"<leader>ri",
-	[[ <Cmd>lua require('refactoring').refactor('Inline Variable')<CR>]],
-	{ noremap = true, silent = true, expr = false }
-)
-vim.api.nvim_set_keymap(
-	"n",
-	"<leader>rx",
-	[[ <Cmd>lua require('refactoring').refactor('Extract Variable')<CR>]],
-	{ noremap = true, silent = true, expr = false }
-)

vim/.vim/lua/config/telekasten.lua

@@ -1,43 +0,0 @@
-local home = vim.fn.expand("~/zettelkasten")
-
-require("telekasten").setup({
-	home = home,
-})
-
-vim.cmd([[
-nnoremap <leader>zf :lua require('telekasten').find_notes()<CR>
-nnoremap <leader>zd :lua require('telekasten').find_daily_notes()<CR>
-nnoremap <leader>zg :lua require('telekasten').search_notes()<CR>
-nnoremap <leader>zz :lua require('telekasten').follow_link()<CR>
-autocmd FileType markdown nnoremap <Enter> :lua require('telekasten').follow_link()<CR>
-autocmd FileType markdown vnoremap <leader>zf :lua require('telekasten').follow_link()<CR>
-nnoremap <leader>zT :lua require('telekasten').goto_today()<CR>
-nnoremap <leader>zW :lua require('telekasten').goto_thisweek()<CR>
-nnoremap <leader>zw :lua require('telekasten').find_weekly_notes()<CR>
-nnoremap <leader>zn :lua require('telekasten').new_note()<CR>
-nnoremap <leader>zN :lua require('telekasten').new_templated_note()<CR>
-nnoremap <leader>zy :lua require('telekasten').yank_notelink()<CR>
-nnoremap <leader>zc :lua require('telekasten').show_calendar()<CR>
-nnoremap <leader>zC :CalendarT<CR>
-nnoremap <leader>zi :lua require('telekasten').paste_img_and_link()<CR>
-nnoremap <leader>zt :lua require('telekasten').toggle_todo()<CR>
-nnoremap <leader>zb :lua require('telekasten').show_backlinks()<CR>
-nnoremap <leader>zF :lua require('telekasten').find_friends()<CR>
-nnoremap <leader>zI :lua require('telekasten').insert_img_link({ i=true })<CR>
-nnoremap <leader>zp :lua require('telekasten').preview_img()<CR>
-nnoremap <leader>zm :lua require('telekasten').browse_media()<CR>
-nnoremap <leader>za :lua require('telekasten').show_tags()<CR>
-nnoremap <leader># :lua require('telekasten').show_tags()<CR>
-nnoremap <leader>zr :lua require('telekasten').rename_note()<CR>
-
-" on hesitation, bring up the panel
-nnoremap <leader>z :lua require('telekasten').panel()<CR>
-
-" colors
-hi tklink ctermfg=72 guifg=#689d6a cterm=bold,underline gui=bold,underline
-hi tkBrackets ctermfg=gray guifg=gray
-
-hi tkTagSep ctermfg=gray guifg=gray
-hi tkTag ctermfg=175 guifg=#d3869B
-]])
--- autocmd FileType markdown vnoremap <Enter> :norm ysiw\]ysa\]\] lua require('telekasten').follow_link()<CR>

vim/.vim/lua/config/tmpl.lua

@@ -0,0 +1,31 @@
+vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, {
+  group = vim.api.nvim_create_augroup('gotmpl_highlight', { clear = true }),
+  pattern = '*.tmpl',
+  callback = function()
+    local filename = vim.fn.expand('%:t')
+    local ext = filename:match('.*%.(.-)%.tmpl$')
+
+    -- Add more extension to syntax mappings here if you need to.
+    local ext_filetypes = {
+      go = 'go',
+      html = 'html',
+      md = 'markdown',
+      yaml = 'yaml',
+      yml = 'yaml',
+      -- cc = 'cpp',
+      -- h = 'cpp',
+    }
+
+    if ext and ext_filetypes[ext] then
+      -- Set the primary filetype
+      vim.bo.filetype = ext_filetypes[ext]
+
+      -- Define embedded Go template syntax
+      vim.cmd([[
+        syntax include @gotmpl syntax/gotmpl.vim
+        syntax region gotmpl start="{{" end="}}" contains=@gotmpl containedin=ALL
+        syntax region gotmpl start="{%" end="%}" contains=@gotmpl containedin=ALL
+      ]])
+    end
+  end,
+})

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/config/zip.lua

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

vim/.vim/lua/plugin_init.lua

@@ -1,16 +0,0 @@
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-	vim.fn.system({
-		"git",
-		"clone",
-		"--filter=blob:none",
-		"https://github.com/folke/lazy.nvim.git",
-		lazypath,
-	})
-end
-vim.opt.rtp:prepend(lazypath)
-
-package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua"
-
-require("lazy").setup("plugins")
-require("config.clipboard")

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,132 +1,162 @@
 local use_google = require("utils").use_google
-local buf_too_large = require("utils").buf_too_large
 
 return {
-	{
+    {
-		"Bekaboo/dropbar.nvim",
+    "folke/flash.nvim",
-		-- optional, but required for fuzzy finder support
+    event = "VeryLazy",
-		dependencies = {
+    ---@type Flash.Config
-			"nvim-telescope/telescope-fzf-native.nvim",
+    opts = {},
-		},
+    -- stylua: ignore
-		config = function()
+    keys = {
-			vim.ui.select = require("dropbar.utils.menu").select
+      { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
-		end,
+      { "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", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-		"RRethy/vim-illuminate",
+      { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
-		config = function()
+    },
-			local aug = vim.api.nvim_create_augroup("buf_large", { clear = true })
+  },
-			vim.api.nvim_create_autocmd({ "BufReadPre" }, {
+  "tikhomirov/vim-glsl",
-				callback = function()
+  "sindrets/diffview.nvim",
-					if buf_too_large() then
+  { "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
-						vim.b.large_buf = true
+  {
-						vim.cmd("syntax off")
+    "MagicDuck/grug-far.nvim",
-						vim.cmd("IlluminatePauseBuf") -- disable vim-illuminate
+    config = function()
-						vim.opt_local.foldmethod = "manual"
+      require("grug-far").setup({
-						vim.opt_local.spell = false
+        -- search and replace engines configuration
-					else
+        engines = {
-						vim.b.large_buf = false
+          -- see https://github.com/BurntSushi/ripgrep
-					end
+          ripgrep = {
-				end,
+            -- ripgrep executable to use, can be a different path if you need to configure
-				group = aug,
+            path = "rg",
-				pattern = "*",
+            -- extraArgs = "-.",
-			})
+          },
-		end,
+        },
-	},
+      })
-	"kdheepak/lazygit.nvim",
+    end,
-	"flwyd/vim-conjoin",
+  },
-	"rafcamlet/nvim-luapad",
+  {
-	"vim-scripts/vcscommand.vim",
+    "shellRaining/hlchunk.nvim",
-	"AndrewRadev/tagalong.vim",
+    event = { "BufReadPre", "BufNewFile" },
-	"AndrewRadev/yankwin.vim",
+    opts = {
-	{ "squk/gdrama-syntax.vim", ft = "gdrama" },
+      line_num = { enable = true },
-	{ "nvim-lua/plenary.nvim", lazy = false },
+      chunk = {
-	{ "squk/java-syntax.vim", ft = "java" },
+        enable = true,
-	{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
+        priority = 15,
-	{ "andymass/vim-matchup", event = "VimEnter" },
+        style = {
-	{ "jghauser/mkdir.nvim", event = "BufWritePre" },
+          { fg = "#393d4c" },
-	-- Session management
+        },
-	{
+        chars = {
-		"folke/persistence.nvim",
+          horizontal_line = "─",
-		event = "BufReadPre", -- this will only start session saving when an actual file was opened
+          -- vertical_line = "│",
-		opts = {
+          vertical_line = "┊",
-			-- add any custom options here
+          left_top = "╭",
-		},
+          left_bottom = "╰",
-		keys = {
+          right_arrow = ">",
-			{ "<leader>s", [[<cmd>lua require("persistence").load()<cr>]] },
+        },
-		},
+        use_treesitter = true,
-	},
+        textobject = "",
-	{
+        max_file_size = 1024 * 1024,
-		"johmsalas/text-case.nvim",
+        error_sign = true,
-		dependencies = { "nvim-telescope/telescope.nvim" },
+        -- animation related
-		config = function()
+        duration = 0,
-			require("textcase").setup({})
+        delay = 0,
-			require("telescope").load_extension("textcase")
+      },
-		end,
+    },
-		cmd = {
+  },
-			"Subs",
+  "RRethy/vim-illuminate",
-		},
+  "kdheepak/lazygit.nvim",
-		keys = {
+  "flwyd/vim-conjoin",
-			{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
+  "rafcamlet/nvim-luapad",
-		},
+  "vim-scripts/vcscommand.vim",
-	},
+  "AndrewRadev/tagalong.vim",
-	{
+  "AndrewRadev/yankwin.vim",
-		"NvChad/nvim-colorizer.lua",
+  { "squk/gdrama-syntax.vim",   ft = "gdrama" },
-		ft = "lua",
+  { "nvim-lua/plenary.nvim",    lazy = false },
-		config = function()
+  { "squk/java-syntax.vim",     ft = "java" },
-			require("colorizer").setup()
+  { "udalov/kotlin-vim",        event = "VeryLazy",                        ft = "kotlin" },
-		end,
+  { "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,
-		keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
+    -- stylua: ignore
-	},
+    keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
-	{
+  },
-		"stevearc/aerial.nvim",
+  {
-		opts = {},
+    "stevearc/aerial.nvim",
-		cmd = { "AerialToggle", "AerialOn" },
+    opts = {},
-		keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
+    cmd = { "AerialToggle", "AerialOn" },
-	},
+    -- stylua: ignore
-	{
+    keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
-		"andrewferrier/debugprint.nvim",
+  },
-		opts = {},
+  {
-		-- Dependency only needed for NeoVim 0.8
+    "andrewferrier/debugprint.nvim",
-		dependencies = {
+    opts = {},
-			"nvim-treesitter/nvim-treesitter",
+    -- Dependency only needed for NeoVim 0.8
-		},
+    dependencies = {
-		-- Remove the following line to use development versions,
+      "nvim-treesitter/nvim-treesitter",
-		-- not just the formal releases
+    },
-		version = "*",
+    -- Remove the following line to use development versions,
-		keys = {
+    -- not just the formal releases
-			{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
+    version = "*",
-			{ "<leader>dP", ":lua require('debugprint').debugprint({above = true})<cr>", desc = "Debug print" },
+    -- stylua: ignore
-			{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
+    keys = {
-			{
+      { "<leader>dp", ":lua require('debugprint').debugprint()<cr>",                                desc = "Debug print" },
-				"<leader>dQ",
+      { "<leader>dP", ":lua require('debugprint').debugprint({above = true})<cr>",                  desc = "Debug print" },
-				":lua require('debugprint').debugprint({variable = true, above = true})<cr>",
+      { "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>",               desc = "Debug print" },
-				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

@@ -0,0 +1,30 @@
+return {
+  "LunarVim/bigfile.nvim",
+  opts = {
+    filesize = 2, -- size of the file in MiB, the plugin round file sizes to the closest MiB
+    pattern = function(bufnr, filesize_mib)
+      -- 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",
+      "matchparen",
+      -- "vimopts",
+      -- "filetype",
+    },
+  }
+}

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

@@ -0,0 +1,183 @@
+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 {
+	{
+		"saghen/blink.compat",
+		-- use the latest release, via version = '*', if you also use the latest release for blink.cmp
+		version = "*",
+		-- lazy.nvim will automatically load the plugin when it's required by blink.cmp
+		lazy = true,
+		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 = {
+			"chrisgrieser/cmp-nerdfont",
+			"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',
+
+		---@module 'blink.cmp'
+		---@type blink.cmp.Config
+		opts = {
+      -- stylua: ignore
+      keymap = {
+        preset = "none",
+        ["<C-space>"] = { "show", "show_documentation", "hide_documentation" },
+        ["<C-e>"] = { "hide", "fallback" },
+        ["<CR>"] = { "accept", "fallback" },
+
+        ["<Tab>"] = { "select_next", "snippet_forward", "accept", "fallback" },
+        ["<S-Tab>"] = { "select_prev", "snippet_backward", "fallback" },
+
+        ["<Up>"] = { "select_prev", "fallback" },
+        ["<Down>"] = { "select_next", "fallback" },
+
+        ["<S-Up>"] = { "scroll_documentation_up", "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",
+						"snippets",
+						"ripgrep",
+						"emoji",
+						"nerdfont",
+						"buffer",
+						"avante",
+					}
+					if use_google() then
+						table.insert(providerToEnable, "nvim_ciderlsp")
+						table.insert(providerToEnable, "buganizer")
+						-- table.insert(providerToEnable, "avante")
+					else
+						-- table.insert(providerToEnable, "avante")
+						table.insert(providerToEnable, "minuet")
+					end
+					return providerToEnable
+				end,
+				providers = {
+					lsp = { name = "LSP", module = "blink.cmp.sources.lsp", score_offset = 90 },
+					-- dont show LuaLS require statements when lazydev has items
+					lazydev = { name = "LazyDev", module = "lazydev.integrations.blink", fallbacks = { "lsp" } },
+					ripgrep = {
+						module = "blink-ripgrep",
+						name = "Ripgrep",
+						-- the options below are optional, some default values are shown
+						---@module "blink-ripgrep"
+						---@type blink-ripgrep.Options
+						opts = {
+							prefix_min_len = 3,
+							context_size = 5,
+							max_filesize = "1M",
+							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",
+					},
+				},
+			},
+			-- 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 = { "'", '"', "(", "{" },
+				},
+			},
+		},
+
+		-- allows extending the providers array elsewhere in your config
+		-- without having to redefine it
+		opts_extend = { "sources.default" },
+	},
+}

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

@@ -1,24 +1,12 @@
 local use_google = require("utils").use_google
-
+local flags = require("utils").flags
-local function compare_by_ciderlsp_score(entry1, entry2)
-	if entry1.completion_item.score ~= nil and entry2.completion_item.score ~= nil then
-		print("LSP score " .. entry1.completion_item.score)
-		print("LSP score " .. entry2.completion_item.score)
-		return entry1.completion_item.score > entry2.completion_item.score
-	end
-end
-
-local has_words_before = function()
-	local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-	return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-end
 
 return {
 	{
 		"hrsh7th/nvim-cmp",
 		event = { "InsertEnter", "CmdlineEnter" },
+		cond = not flags.blink,
 		dependencies = {
-			"Exafunction/codeium.nvim",
 			"FelipeLema/cmp-async-path",
 			"amarakon/nvim-cmp-buffer-lines",
 			"chrisgrieser/cmp-nerdfont",
@@ -49,44 +37,21 @@ return {
 
 			if use_google() then
 				table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 8 })
-				table.insert(conditionalSources, { name = "analysislsp" })
 				table.insert(conditionalSources, { name = "buganizer", option = { notifications_enabled = true } })
-			else
-				table.insert(conditionalSources, { name = "codeium", priority = 8 })
 			end
 
 			local lspkind = require("lspkind")
 			lspkind.init()
-			vim.api.nvim_create_autocmd("FileType", {
-				callback = function(args)
-					local max_filesize = 100 * 1024 -- 100 KB
-					local fname = vim.api.nvim_buf_get_name(args.buf)
-					local ok, stats = pcall(vim.loop.fs_stat, fname)
-					if ok and stats and stats.size > max_filesize then
-						vim.schedule(function()
-							vim.notify(
-								string.format(
-									"Disabling nvim-cmp for buffer. File %s exceeds maximum configured size.",
-									fname
-								)
-							)
-						end)
-						require("cmp").setup.buffer({
-							enabled = false,
-						})
-					end
-				end,
-			})
 
 			cmp.setup.filetype("txt", {
 				enabled = false,
 			})
-
 			-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
 			cmp.setup.cmdline({ "/", "?" }, {
 				mapping = cmp.mapping.preset.cmdline(),
 				sources = cmp.config.sources({
 					{ name = "treesitter" },
+					{ name = "buffer" },
 				}),
 			})
 
@@ -149,13 +114,11 @@ return {
 							async_path = " path",
 							buffer = " Buf",
 							cmdline = " cmd",
-							codeium = "󰚩 Codeium",
 							crates = " rust",
 							luasnip = " snip",
 							buganizer = " Buganizer",
 							nerdfont = "󰊪 nerdfont",
 							nvim_ciderlsp = "󰚩 Cider",
-							analysislsp = "󰟌 analysislsp",
 							nvim_lsp_signature_help = "󰊕",
 							nvim_lsp = " LSP",
 							nvim_lua = " lua",
@@ -191,8 +154,6 @@ return {
 					["<Tab>"] = cmp.mapping(function(fallback)
 						if cmp.visible() then
 							cmp.select_next_item()
-						elseif luasnip.locally_jumpable(1) then
-							luasnip.jump(1)
 						else
 							fallback()
 						end
@@ -200,8 +161,6 @@ return {
 					["<S-Tab>"] = cmp.mapping(function(fallback)
 						if cmp.visible() then
 							cmp.select_prev_item()
-						elseif luasnip.locally_jumpable(-1) then
-							luasnip.jump(-1)
 						else
 							fallback()
 						end

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,67 +1,89 @@
-vim.api.nvim_create_user_command("FormatDisable", function(args)
+local use_google = require("utils").use_google
-	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",
-})
 
 return {
-	{
+  {
-		"stevearc/conform.nvim",
+    "stevearc/conform.nvim",
-		event = { "BufWritePre" },
+    event = { "BufWritePre" },
-		cmd = { "ConformInfo" },
+    cmd = { "ConformInfo", "FormatDisable", "FormatEnable" },
-		keys = {
+    keys = {
-			{
+      -- stylua: ignore
-				"<leader>fmt",
+      { "<leader>fmt", function() require("conform").format({ async = true, lsp_fallback = true }) end, mode = "", desc = "Format buffer", },
-				function()
+      { "<leader>fj",  ":%!python -m json.tool" },
-					require("conform").format({ async = true, lsp_fallback = true })
+    },
-				end,
+    config = function()
-				mode = "",
+      vim.g.disable_autoformat = false
-				desc = "Format buffer",
+      vim.api.nvim_create_user_command("FormatDisable", function(args)
-			},
+        if args.bang then
-		},
+          -- FormatDisable! will disable formatting just for this buffer
-		opts = {
+          vim.b.disable_autoformat = true
-			formatters_by_ft = {
+        else
-				-- Conform will run multiple formatters sequentially
+          vim.g.disable_autoformat = true
-				-- go = { "goimports", "gofmt" },
+        end
-				-- Use a sub-list to run only the first available formatter
+      end, {
-				-- javascript = { { "prettierd", "prettier" } },
+        desc = "Disable autoformat-on-save",
-				lua = { "stylua" },
+        bang = true,
-				-- Conform will run multiple formatters sequentially
+      })
-				python = { "isort", "black" },
+      vim.api.nvim_create_user_command("FormatEnable", function()
-				-- Use a sub-list to run only the first available formatter
+        vim.b.disable_autoformat = false
-				javascript = { { "prettierd", "prettier" } },
+        vim.g.disable_autoformat = false
-				gdscript = { "gdformat" },
+      end, {
-				dashboard = {},
+        desc = "Re-enable autoformat-on-save",
-				-- Use the "*" filetype to run formatters on all filetypes.
+      })
-				["*"] = { "codespell" },
+
-				-- Use the "_" filetype to run formatters on filetypes that don't
+      vim.api.nvim_create_autocmd("BufWritePre", {
-				-- have other formatters configured.
+        pattern = "*",
-				["_"] = { "trim_whitespace" },
+        callback = function(args)
-			},
+          if vim.g.disable_autoformat or vim.b[args.buf].disable_autoformat then
-			format_on_save = function(bufnr)
+            return
-				-- Disable with a global or buffer-local variable
+          end
-				if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+          require("conform").format({ bufnr = args.buf })
-					return
+        end,
-				end
+      })
-				return { timeout_ms = 500, lsp_fallback = true }
+
-			end,
+      vim.api.nvim_create_user_command("Format", function(args)
-			formatters = {
+        local range = nil
-				gdformat = {
+        if args.count ~= -1 then
-					prepend_args = { "-l", "100" },
+          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" },
+        -- Conform will run multiple formatters sequentially
+        -- go = { "goimports", "gofmt" },
+        -- Use a sub-list to run only the first available formatter
+        lua = { "stylua" },
+        -- Conform will run multiple formatters sequentially
+        python = { "isort" },
+        -- Use a sub-list to run only the first available formatter
+        javascript = { "prettier" },
+        gdscript = { "gdformat" },
+        ron = { "ronfmt" },
+        dashboard = {},
+        -- Use the "*" filetype to run formatters on all filetypes.
+        -- ["*"] = { "codespell" },
+        -- Use the "_" filetype to run formatters on filetypes that don't
+        -- have other formatters configured.
+        ["_"] = { "trim_whitespace" },
+      },
+      formatters = {
+        -- ronfmt = {
+        -- 	command = "ronfmt",
+        -- 	args = { "-d", "$FILENAME" },
+        -- },
+        gdformat = {
+          prepend_args = { "-l", "100" },
+        },
+      },
+    })
+    end,
+  },
 }

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

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

vim/.vim/lua/plugins/dashboard.lua

@@ -42,6 +42,6 @@ return {
 			},
 		})
 	end,
-	keys = { { "<C-Space>", ":Dashboard<CR>" } },
+	-- keys = { { "<C-Space>", ":Dashboard<CR>" } },
 	dependencies = { { "nvim-tree/nvim-web-devicons" } },
 }

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,49 +25,65 @@ 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>" },
-			{ "<leader>xw", "<cmd>:Trouble workspace_diagnostics<CR>" },
+			{ "gr", ":Telescope lsp_references<CR>" },
-			{ "<leader>xd", "<cmd>:Trouble document_diagnostics<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>" },
 		},
 	},
 	{
-		"Maan2003/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.schedule(function()
-				vim.diagnostic.config({
+			vim.diagnostic.config({
-					severity_sort = true,
+				severity_sort = true,
-					virtual_text = false,
+				virtual_text = false,
-					virtual_improved = {
+				virtual_improved = {
-						severity = { min = vim.diagnostic.severity.WARN },
+					severity = { min = vim.diagnostic.severity.WARN },
-						current_line = "hide",
+					current_line = "hide",
-					},
+				},
-					virtual_lines = {
+				virtual_lines = {
-						severity = { min = vim.diagnostic.severity.HINT },
+					severity = { min = vim.diagnostic.severity.HINT },
-						highlight_whole_line = false,
+					highlight_whole_line = false,
-						only_current_line = true,
+					only_current_line = true,
-					},
+				},
-				})
+			})
-			end)
+			-- end)
 		end,
 		keys = {
 			{
@@ -64,7 +94,7 @@ return {
 					else
 						vim.diagnostic.config({
 							virtual_improved = {
-								severity = { min = vim.diagnostic.severity.HINT },
+								severity = { min = vim.diagnostic.severity.WARN },
 								current_line = "hide",
 							},
 						})

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

@@ -1,342 +1,312 @@
 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")
+vim.opt.rtp:append("/google/src/head/depot/google3/experimental/users/fentanes/nvgoog/")
 
--- local glug = require("nvgoog.google.util.glug").glug
--- local glugOpts = require("nvgoog.google.util.glug").glugOpts
 local glug = require("glug").glug
 local glugOpts = require("glug").glugOpts
-local veryLazy = require("nvgoog.util").veryLazy
+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,
-	-- maktaba is required by all google plugins
+    dependencies = {},
-	glug("maktaba", {
+    config = function() -- init?
-		lazy = true,
+      vim.cmd("source /usr/share/vim/google/glug/bootstrap.vim")
-		dependencies = {},
+    end,
-		config = function() -- init?
+  }),
-			vim.cmd("source /usr/share/vim/google/glug/bootstrap.vim")
+  glug("googler", {
-		end,
+    event = "VeryLazy",
-	}),
+  }),
-	glug("logmsgs", {
+  glug("glaive"),
-		event = "VeryLazy",
+  glug("alert"),
-	}),
+  glug("googlespell"),
-	glug("googler", {
+  -- Add support for google filetypes
-		event = "VeryLazy",
+  glug("google-filetypes", { event = { "BufReadPre", "BufNewFile" }, dependencies = {} }),
-	}),
-	glug("core"),
-	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 = {} }),
 
-	-- Other filetype detection
+  glug("add_usings"),
-	veryLazy(glug("ft-cel", { event = "BufRead,BufNewFile *.cel,*jvp" })),
+  -- Autogens boilerplate when creating new files
-	veryLazy(glug("ft-clif", { event = "BufRead,BufNewFile *.clif" })),
+  glug("autogen", {
-	veryLazy(glug("ft-gin", { event = "BufRead,BufNewFile *.gin" })),
+    event = "BufNewFile",
-	veryLazy(glug("ft-gss", { event = "BufRead,BufNewFile *.gss" })),
+  }),
-	veryLazy(glug("ft-proto", { event = "BufRead,BufNewFile *.proto,*.protodevel,*.rosy,*.textproto" })),
+  -- Adds G4 support to the vcscommand plugin
-	veryLazy(glug("ft-soy", { event = "BufRead,BufNewFile *.soy" })),
+  glug("googlepaths"),
-	-- Set up syntax, indent, and core settings for various filetypes
+  -- Set up syntax, indent, and core settings for various filetypes
-	veryLazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })),
+  superlazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })),
-	veryLazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })),
+  -- superlazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })),
-	veryLazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })),
+  superlazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })),
-	veryLazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
+  superlazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
-	veryLazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
+  superlazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
-	veryLazy(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
-	-- glug("googlestyle", { event = { "BufRead", "BufNewFile" } }),
+  superlazy(glug("googlestyle", { event = { "BufRead", "BufNewFile" } })),
 
-	veryLazy(glug("add_usings")),
+  glug("ft-soy"),
-	-- Autogens boilerplate when creating new files
+  glug("ft-gss"),
-	glug("autogen", {
+  glug("ft-proto"),
-		event = "BufNewFile",
+  glug("g4"),
-	}),
+  glug("outline-window"),
-	-- Adds G4 support to the vcscommand plugin
+  glug("fzf-query"),
-	glug("googlepaths"),
+  -- Open current file in chrome
-	glug("ft-soy"),
+  glug("corpweb", {
-	glug("ft-gss"),
+    dependencies = {
-	glug("ft-proto"),
+      glug("launchbrowser"),
-	glug("g4"),
+    },
-	glug("outline-window"),
+    cmd = {
-	glug("fzf-query"),
+      -- Launches {query} under codesearch in a web browser
-	-- Open current file in chrome
+      "CorpWebCs",
-	glug("corpweb", {
+      -- Launches the current file under codesearch in a web browser
-		dependencies = {
+      "CorpWebCsFile",
-			glug("launchbrowser"),
+      -- Launches the current file doc view (i.e., Cantata, G3Docs, or godoc)
-		},
+      "CorpWebDocFindFile",
-		cmd = {
+      -- Launches the current CL in Critique
-			-- Launches {query} under codesearch in a web browser
+      "CorpWebCritiqueCl",
-			"CorpWebCs",
+      -- Launches the current CL in Cider
-			-- Launches the current file under codesearch in a web browser
+      "CorpWebCider",
-			"CorpWebCsFile",
+      -- Launches {query} under cs.chromium.org in a web browser
-			-- Launches the current file doc view (i.e., Cantata, G3Docs, or godoc)
+      "CorpWebChromeCs",
-			"CorpWebDocFindFile",
+    },
-			-- Launches the current CL in Critique
+  }),
-			"CorpWebCritiqueCl",
+  glug("relatedfiles", {
-			-- Launches the current CL in Cider
+    -- stylua: ignore
-			"CorpWebCider",
+    keys = {
-			-- Launches {query} under cs.chromium.org in a web browser
+      { "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
-			"CorpWebChromeCs",
+      { "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
-		},
+      { "<leader>rh", ":exec relatedfiles#selector#JumpToHeader()<CR>" },
-	}),
+      { "<leader>rc", ":exec relatedfiles#selector#JumpToCodeFile()<CR>" },
-	glug("relatedfiles", {
+    },
-		keys = {
+  }),
-			{ "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
+  { "junegunn/fzf",                 dir = "~/.fzf",                   build = "./install --all" },
-			{ "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
+  { "junegunn/fzf.vim",             dependencies = { "junegunn/fzf" } },
-			{ "<leader>rh", ":exec relatedfiles#selector#JumpToHeader()<CR>" },
+  -- Format google code
-			{ "<leader>rc", ":exec relatedfiles#selector#JumpToCodeFile()<CR>" },
+  glug("codefmt-google", {
-		},
+    dependencies = {
-	}),
+      glug("codefmt", {
-	{ "junegunn/fzf", dir = "~/.fzf", build = "./install --all" },
+        opts = {
-	{ "junegunn/fzf.vim", dependencies = { "junegunn/fzf" } },
+          clang_format_executable = "/usr/bin/clang-format",
-	-- Format google code
+          clang_format_style = "function('codefmtgoogle#GetClangFormatStyle')",
-	glug("codefmt-google", {
+          gofmt_executable = "/usr/lib/google-golang/bin/gofmt",
-		dependencies = {
+          prettier_executable = "/google/data/ro/teams/prettier/prettier",
-			glug("codefmt", {
+          ktfmt_executable = { "/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt", "--google-style" },
-				opts = {
+        },
-					clang_format_executable = "/usr/bin/clang-format",
+      }),
-					clang_format_style = "function('codefmtgoogle#GetClangFormatStyle')",
+    },
-					gofmt_executable = "/usr/lib/google-golang/bin/gofmt",
+    opts = {
-					prettier_executable = "/google/data/ro/teams/prettier/prettier",
+      auto_format = {
-					ktfmt_executable = { "/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt", "--google-style" },
+        ["borg"] = "gclfmt",
-				},
+        ["gcl"] = "gclfmt",
-			}),
+        ["patchpanel"] = "gclfmt",
-		},
+        ["bzl"] = "buildifier",
-		opts = {
+        ["c"] = "clang-format",
-			auto_format = {
+        ["cpp"] = "clang-format",
-				["borg"] = "gclfmt",
+        ["javascript"] = "clang-format",
-				["gcl"] = "gclfmt",
+        ["typescript"] = "clang-format",
-				["patchpanel"] = "gclfmt",
+        ["dart"] = "dartfmt",
-				["bzl"] = "buildifier",
+        ["go"] = "gofmt",
-				["c"] = "clang-format",
+        ["java"] = "google-java-format",
-				["cpp"] = "clang-format",
+        ["kotlin"] = "ktfmt",
-				["javascript"] = "clang-format",
+        ["jslayout"] = "jslfmt",
-				["typescript"] = "clang-format",
+        ["markdown"] = "mdformat",
-				["dart"] = "dartfmt",
+        ["ncl"] = "nclfmt",
-				["go"] = "gofmt",
+        ["python,piccolo"] = "pyformat",
-				["java"] = "google-java-format",
+        ["soy"] = "soyfmt",
-				["kotlin"] = "ktfmt",
+        ["textpb"] = "text-proto-format",
-				["jslayout"] = "jslfmt",
+        ["proto"] = "protofmt",
-				["markdown"] = "mdformat",
+        ["sql"] = "format_sql",
-				["ncl"] = "nclfmt",
+      },
-				["python,piccolo"] = "pyformat",
+    },
-				["soy"] = "soyfmt",
+    cmd = { "FormatLines", "FormatCode", "AutoFormatBuffer" },
-				["textpb"] = "text-proto-format",
+    event = "VimEnter",
-				["proto"] = "protofmt",
-				["sql"] = "format_sql",
-			},
-		},
-		cmd = { "FormatLines", "FormatCode", "AutoFormatBuffer" },
-		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", {
-	veryLazy(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/sakal/cmp-nvim-ciderlsp",
+  {
-		-- url = "sso://googler@user/piloto/cmp-nvim-ciderlsp",
+    name = "ciderlsp-nvim",
-		event = "VimEnter",
+    url = "sso://googler@user/kdark/ciderlsp-nvim",
-		dependencies = {
+    event = "VimEnter",
-			"hrsh7th/nvim-cmp",
+  },
-		},
+  -- {
-	},
+  --     name = "nvim_figtree",
-	{
+  --     url = "sso://googler@user/jackcogdill/nvim-figtree",
-		name = "ciderlsp-nvim",
+  -- },
-		url = "sso://googler@user/kdark/ciderlsp-nvim",
+  {
-		event = "VimEnter",
+    name = "telescope_codesearch",
-		dependencies = {
+    url = "sso://googler@user/vintharas/telescope-codesearch.nvim",
-			"hrsh7th/nvim-cmp",
+    dependencies = { "nvim-telescope/telescope.nvim" },
-		},
+    config = function() end,
-	},
+  },
-	-- {
+  {
-	--     name = "nvim_figtree",
+    name = "telescope_citc",
-	--     url = "sso://googler@user/jackcogdill/nvim-figtree",
+    url = "sso://googler@user/aktau/telescope-citc.nvim",
-	-- },
+    dependencies = { "nvim-telescope/telescope.nvim" },
-	{
+  },
-		name = "telescope_codesearch",
+  {
-		url = "sso://googler@user/vintharas/telescope-codesearch.nvim",
+    name = "telescope_fig",
-		dependencies = { "nvim-telescope/telescope.nvim" },
+    url = "sso://googler@user/tylersaunders/telescope-fig.nvim",
-	},
+    dependencies = { "nvim-telescope/telescope.nvim" },
-	{
+  },
-		name = "telescope_citc",
+  {
-		url = "sso://googler@user/aktau/telescope-citc.nvim",
+    name = "critique-nvim",
-		dependencies = { "nvim-telescope/telescope.nvim" },
+    dir = "~/critique-nvim/",
-	},
+    lazy = false,
-	{
+    dependencies = {
-		name = "telescope_fig",
+      "rktjmp/time-ago.vim",
-		url = "sso://googler@user/tylersaunders/telescope-fig.nvim",
+      "nvim-lua/plenary.nvim",
-		dependencies = { "nvim-telescope/telescope.nvim" },
+      "nvim-telescope/telescope.nvim",
-	},
+      "runiq/neovim-throttle-debounce",
-	{
+    },
-		name = "critique-nvim",
+    -- here are some mappings you might want:
-		dir = "~/critique-nvim/",
+    keys = {
-		lazy = false,
+      { "<Leader>lc", ":CritiqueToggleLineComment<CR>" },
-		dependencies = {
+      { "<Leader>ac", ":CritiqueToggleAllComments<CR>" },
-			"rktjmp/time-ago.vim",
+      { "<Leader>uc", ":CritiqueToggleUnresolvedComments<CR>" },
-			"nvim-lua/plenary.nvim",
+      { "<Leader>fc", ":CritiqueFetchComments<CR>" },
-			"nvim-telescope/telescope.nvim",
+      { "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
-			"runiq/neovim-throttle-debounce",
+    },
-		},
+    config = function()
-		-- here are some mappings you might want:
+      -- Here are all the options and their default values:
-		keys = {
+      require("critique.comments").setup({
-			{ "]c", ":CritiqueGotoNextComment<CR>" },
+        -- debug = 1, -- default = 0
-			{ "[c", ":CritiqueGotoPrevComment<CR>" },
+        -- Fetch the comments after calling `setup`.
-			{ "<Leader>lc", ":CritiqueToggleLineComment<CR>" },
+        auto_fetch = true,     -- default = true
-			{ "<Leader>uc", ":CritiqueToggleUnresolvedComments<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>fc", ":CritiqueFetchComments<CR>" },
+        frequent_fetch = true, -- default = false
-			{ "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
+        verbose_notifications = true,
-		},
+      })
-		config = function()
+    end,
-			-- Here are all the options and their default values:
+  },
-			require("critique.comments").setup({
+  {
-				debug = 0, -- default = 0
+    url = "sso://googler@user/mccloskeybr/luasnip-google.nvim",
-				-- Fetch the comments after calling `setup`.
+    config = function()
-				auto_fetch = true, -- default = true
+      require("luasnip-google").load_snippets()
-				-- Allow checking for comments on BufEnter events. This is throttled to once every 10 seconds.
+    end,
-				frequent_fetch = true, -- default = false
+  },
-				verbose_notifications = true,
+  {
-			})
+    name = "hg",
-		end,
+    url = "sso://googler@user/smwang/hg.nvim",
-	},
+    dependencies = { "ipod825/libp.nvim" },
-	{
+    config = function()
-		url = "sso://googler@user/mccloskeybr/luasnip-google.nvim",
+      require("hg").setup()
-		config = function()
+    end,
-			require("luasnip-google").load_snippets()
+  },
-		end,
-	},
-	{
-		name = "hg",
-		url = "sso://googler@user/smwang/hg.nvim",
-		dependencies = { "ipod825/libp.nvim" },
-		config = function()
-			require("config.fig")
-			require("hg").setup()
-		end,
-	},
 }

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

@@ -1,80 +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,
-	-- 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/lazydev.lua

@@ -0,0 +1,11 @@
+return {
+	"folke/lazydev.nvim",
+	ft = "lua", -- only load on lua files
+	opts = {
+		library = {
+			-- See the configuration section for more details
+			-- Load luvit types when the `vim.uv` word is found
+			{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
+		},
+	},
+}

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,76 +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,
-		event = { "LspAttach" },
+    dependencies = { "rafamadriz/friendly-snippets" },
-		opts = {
+  },
-			autocmd = { enabled = true },
+  {
-			virtual_text = {
+    "ray-x/go.nvim",
-				enabled = true,
+    dependencies = { -- optional packages
-				text = " 󱐋",
+      "ray-x/guihua.lua",
-				hl = "DiagnosticWarn",
+      "neovim/nvim-lspconfig",
-			},
+      "nvim-treesitter/nvim-treesitter",
-			sign = { enabled = false },
+    },
-		},
+    -- cond = not use_google(),
-	},
+    config = function()
-	{
+      local capabilities = flags.blink
-		"L3MON4D3/LuaSnip",
+          and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
-		build = "make install_jsregexp",
+          or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-		config = function()
+      capabilities.offsetEncoding = { "utf-16" }
-			require("luasnip.loaders.from_vscode").lazy_load()
+      require("go").setup({
-		end,
+        lsp_cfg = { capabilities = capabilities },
-		dependencies = { "rafamadriz/friendly-snippets" },
+        lsp_keymaps = false,
-	},
+        lsp_inlay_hints = {
-	{
+          enable = not use_google(), -- doesn't work with ciderlsp
-		"hinell/lsp-timeout.nvim",
+        },
-		event = { "LspAttach" },
+      })
-		dependencies = { "neovim/nvim-lspconfig" },
+      -- Run gofmt + goimports on save
-		-- 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",
-		},
-		config = function()
-			local capabilities =
-				require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-			capabilities.offsetEncoding = { "utf-16" }
-			require("go").setup({
-				capabilities = capabilities,
-			})
-			-- Run gofmt + goimports on save
 
 			local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})
 			vim.api.nvim_create_autocmd("BufWritePre", {
@@ -81,7 +65,6 @@ return {
 				group = format_sync_grp,
 			})
 		end,
-		event = { "CmdlineEnter" },
 		ft = { "go", "gomod" },
 		build = ':lua require("go.install").update_all_sync()', -- if you need to install/update all binaries
 	},
@@ -89,50 +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",
 		},
 		keys = {
-			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
+			{ "<leader>F", ":lua vim.lsp.buf.format()<CR>" },
-			-- { "?", "<cmd>lua vim.lsp.buf.code_action()<CR>" },
+			{ "<leader>i", add_import },
-			{ "L", "<cmd>lua vim.lsp.buf.hover()<CR>" },
+			{ "<leader>rn", ":lua vim.lsp.buf.rename()<CR>" },
-			{ "g0", "<cmd>lua vim.lsp.buf.document_symbol()<CR>" },
+			{ "L", ":lua vim.lsp.buf.hover()<CR>" },
-			{ "gr", "<Cmd>Telescope lsp_references<CR>" },
+			{ "gr", ":Telescope lsp_references<CR>" },
-			{ "gW", "<cmd>lua vim.lsp.buf.workspace_symbol()<CR>" },
+			{ "gd", ":lua vim.lsp.buf.definition()<CR>" },
-			{ "gd", "<cmd>Telescope lsp_definitions<CR>" },
+			-- { "gd", "<cmd>Telescope lsp_definitions<CR>" },
-			{ "gD", "<cmd>tab split | lua vim.lsp.buf.definition()<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>" },
-			{ "gI", "<cmd>lua vim.lsp.buf.implementation()<CR>" },
+			{ "gI", ":lua vim.lsp.buf.implementation()<CR>" },
-			{ "gR", "<cmd>lua vim.lsp.buf.references()<CR>" },
+			{ "gR", ":lua vim.lsp.buf.references()<CR>" },
-			{ "gt", "<cmd>lua vim.lsp.buf.type_definition()<CR>" },
+			{ "gt", ":lua vim.lsp.buf.type_definition()<CR>" },
-			{ "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>" },
+			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>" },
-			{ "<C-g>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
+			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
-			{ "<leader>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", mode = "v" },
 		},
 		config = function()
-			local lsp_status = require("lsp-status")
-			lsp_status.register_progress()
-
-			vim.opt.spell = true
-			vim.opt.spelllang = { "en_us" }
-
-			local capabilities =
-				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/mason.lua

@@ -23,7 +23,6 @@ return {
 			TableConcat(lsps, {
 				"pyright",
 				"omnisharp_mono",
-				"tsserver",
 				"docker_compose_language_service",
 				"dockerls",
 				"graphql",
@@ -35,93 +34,95 @@ return {
 
 		require("mason").setup()
 		require("mason-lspconfig").setup({
-			automatic_installation = true,
+			automatic_installation = false,
 			ensure_installed = lsps,
-		})
+			handlers = {
+				-- The first entry (without a key) will be the default handler
+				-- and will be called for each installed server that doesn't have
+				-- a dedicated handler.
+				function(server_name) -- default handler (optional)
+					-- vim.notify("Mason LSP:" .. server_name)
+					require("lspconfig")[server_name].setup({})
+				end,
+				-- Prevent mason from setting up rust_analyzer since that's handled by rustaceanvim
+				["rust_analyzer"] = function() end,
+				["omnisharp_mono"] = function()
+					require("lspconfig").omnisharp_mono.setup({
+						handlers = {
+							["textDocument/definition"] = require("omnisharp_extended").handler,
+						},
+						-- cmd = { "dotnet", "/path/to/omnisharp/OmniSharp.dll" },
 
-		require("mason-lspconfig").setup_handlers({
+						-- Enables support for reading code style, naming convention and analyzer
-			-- The first entry (without a key) will be the default handler
+						-- settings from .editorconfig.
-			-- and will be called for each installed server that doesn't have
+						enable_editorconfig_support = true,
-			-- a dedicated handler.
-			function(server_name) -- default handler (optional)
-				require("lspconfig")[server_name].setup({})
-			end,
-			["omnisharp_mono"] = function()
-				require("lspconfig").omnisharp_mono.setup({
-					handlers = {
-						["textDocument/definition"] = require("omnisharp_extended").handler,
-					},
-					-- cmd = { "dotnet", "/path/to/omnisharp/OmniSharp.dll" },
 
-					-- Enables support for reading code style, naming convention and analyzer
+						-- If true, MSBuild project system will only load projects for files that
-					-- settings from .editorconfig.
+						-- were opened in the editor. This setting is useful for big C# codebases
-					enable_editorconfig_support = true,
+						-- and allows for faster initialization of code navigation features only
+						-- for projects that are relevant to code that is being edited. With this
+						-- setting enabled OmniSharp may load fewer projects and may thus display
+						-- incomplete reference lists for symbols.
+						enable_ms_build_load_projects_on_demand = false, -- default false
 
-					-- If true, MSBuild project system will only load projects for files that
+						-- Enables support for roslyn analyzers, code fixes and rulesets.
-					-- were opened in the editor. This setting is useful for big C# codebases
+						enable_roslyn_analyzers = true, -- default false
-					-- and allows for faster initialization of code navigation features only
-					-- for projects that are relevant to code that is being edited. With this
-					-- setting enabled OmniSharp may load fewer projects and may thus display
-					-- incomplete reference lists for symbols.
-					enable_ms_build_load_projects_on_demand = false, -- default false
 
-					-- Enables support for roslyn analyzers, code fixes and rulesets.
+						-- Specifies whether 'using' directives should be grouped and sorted during
-					enable_roslyn_analyzers = true, -- default false
+						-- document formatting.
+						organize_imports_on_format = true, -- default false
 
-					-- Specifies whether 'using' directives should be grouped and sorted during
+						-- Enables support for showing unimported types and unimported extension
-					-- document formatting.
+						-- methods in completion lists. When committed, the appropriate using
-					organize_imports_on_format = true, -- default false
+						-- directive will be added at the top of the current file. This option can
+						-- have a negative impact on initial completion responsiveness,
+						-- particularly for the first few completion sessions after opening a
+						-- solution.
+						enable_import_completion = true, -- default false
 
-					-- Enables support for showing unimported types and unimported extension
+						-- Specifies whether to include preview versions of the .NET SDK when
-					-- methods in completion lists. When committed, the appropriate using
+						-- determining which version to use for project loading.
-					-- directive will be added at the top of the current file. This option can
+						sdk_include_prereleases = true,
-					-- have a negative impact on initial completion responsiveness,
-					-- particularly for the first few completion sessions after opening a
-					-- solution.
-					enable_import_completion = true, -- default false
 
-					-- Specifies whether to include preview versions of the .NET SDK when
+						-- Only run analyzers against open files when 'enableRoslynAnalyzers' is
-					-- determining which version to use for project loading.
+						-- true
-					sdk_include_prereleases = true,
+						analyze_open_documents_only = true, -- default false
-
+					})
-					-- Only run analyzers against open files when 'enableRoslynAnalyzers' is
+				end,
-					-- true
+				["lua_ls"] = function()
-					analyze_open_documents_only = true, -- default false
+					require("lspconfig").lua_ls.setup({
-				})
+						settings = {
-			end,
+							Lua = {
-			["lua_ls"] = function()
+								runtime = {
-				require("lspconfig").lua_ls.setup({
+									-- Tell the language server which version of Lua you're using
-					settings = {
+									-- (most likely LuaJIT in the case of Neovim)
-						Lua = {
+									version = "LuaJIT",
-							runtime = {
-								-- Tell the language server which version of Lua you're using
-								-- (most likely LuaJIT in the case of Neovim)
-								version = "LuaJIT",
-							},
-							diagnostics = {
-								-- Get the language server to recognize the `vim` global
-								globals = {
-									"vim",
-									"require",
 								},
-							},
+								diagnostics = {
-							workspace = {
+									-- Get the language server to recognize the `vim` global
-								checkThirdParty = false, -- stop a annoying dialog on startup
+									globals = {
-								-- Make the server aware of Neovim runtime files
+										"vim",
-								-- library = vim.api.nvim_get_runtime_file("", true),
+										"require",
-								library = {
+									},
-									[vim.fn.expand("$VIMRUNTIME/lua")] = true,
+								},
-									[vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true,
+								workspace = {
+									checkThirdParty = false, -- stop a annoying dialog on startup
+									-- Make the server aware of Neovim runtime files
+									-- library = vim.api.nvim_get_runtime_file("", true),
+									library = {
+										[vim.fn.expand("$VIMRUNTIME/lua")] = true,
+										[vim.fn.expand("$VIMRUNTIME/lua/vim/lsp")] = true,
+									},
+								},
+								-- Do not send telemetry data containing a randomized but unique identifier
+								telemetry = {
+									enable = false,
 								},
-							},
-							-- Do not send telemetry data containing a randomized but unique identifier
-							telemetry = {
-								enable = false,
 							},
 						},
-					},
+					})
-				})
+				end,
-			end,
+			},
 		})
 	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/neodev.lua

@@ -1,8 +0,0 @@
-return {
-	"folke/neodev.nvim",
-	config = function()
-		require("neodev").setup({
-			library = { plugins = { "nvim-dap-ui" }, types = true },
-		})
-	end,
-}

vim/.vim/lua/plugins/neoscopes.lua

@@ -1,23 +0,0 @@
-return {
-	"smartpde/neoscopes",
-	config = function()
-		require("neoscopes").setup({
-			scopes = {
-				{
-					name = "earlycheckin",
-					dirs = {
-						"java/com/google/android/gmscore/tools/earlycheckin/",
-						"javatests/com/google/android/gmscore/tools/earlycheckin/",
-					},
-				},
-				{ name = "experimental", dirs = { "experimental/users/cnieves" } },
-			},
-			-- add_dirs_to_all_scopes = {
-			--     "~/dotfiles",
-			-- },
-		})
-
-		local scopes = require("neoscopes")
-		scopes.add_startup_scope()
-	end,
-}

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

@@ -1,74 +1,52 @@
+local use_google = require("utils").use_google
+
 return {
-	{
+  -- {
-		"nvim-neo-tree/neo-tree.nvim",
+  -- 	"cmdtree",
-		cmd = {
+  -- 	dir = "~/cmdtree",
-			"Neotree",
+  -- },
-		},
+  {
-		config = function()
+    "nvim-neo-tree/neo-tree.nvim",
-			require("neo-tree").setup({
+    dependencies = {
-				filesystem = {
+      "nvim-lua/plenary.nvim",
-					filtered_items = {
+      "MunifTanjim/nui.nvim",
-						hide_dotfiles = false,
+      --			"~/cmdtree",
-					},
+    },
-					bind_to_cwd = false,
+    cmd = {
-				},
+      "Neotree",
-				sources = {
+    },
-					"filesystem",
+    config = function()
-					"buffers",
+      require("neo-tree").setup({
-					"git_status",
+        hijack_netrw_behavior = "open_default",
-					"diagnostics",
+        filesystem = {
-					"docment_symbols",
+          filtered_items = {
-					-- ...and any additional source
+            hide_dotfiles = false,
-				},
+          },
-				source_selector = {
+          bind_to_cwd = false,
-					winbar = false, -- toggle to show selector on winbar
+        },
-					statusline = false, -- toggle to show selector on statusline
+        sources = {
-					show_scrolled_off_parent_node = false, -- boolean
+          "filesystem",
-					sources = { -- table
+          "buffers",
-						{
+          "git_status",
-							source = "filesystem", -- string
+          --"cmdtree",
-							display_name = "  Files ", -- string | nil
+          -- ...and any additional source
-						},
+        },
-						{
+        window = {
-							source = "buffers", -- string
+          mappings = {
-							display_name = "  Buffers ", -- string | nil
+            ["O"] = "expand_all_nodes",
-						},
+          },
-						{
+        },
-							source = "git_status", -- string
+      })
-							display_name = "  Git ", -- string | nil
+    end,
-						},
+    -- stylua: ignore
-					},
+    keys = {
-					content_layout = "start", -- string
+      (function()
-					tabs_layout = "equal", -- string
+        if use_google() then
-					truncation_character = "…", -- string
+          return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
-					tabs_min_width = nil, -- int | nil
+        end
-					tabs_max_width = nil, -- int | nil
+        return { "<C-n>m", ":Neotree float git_status<CR>", desc = "Open NeoTree CWD float" }
-					padding = 0, -- int | { left: int, right: int }
+      end)(),
-					separator = { left = "▏", right = "▕" }, -- string | { left: string, right: string, override: string | nil }
+      { "<C-n>", ":Neotree toggle left dir=%:p:h<cr>" },
-					separator_active = nil, -- string | { left: string, right: string, override: string | nil } | nil
+    },
-					show_separator_on_edge = false, -- boolean
+  },
-					highlight_tab = "NeoTreeTabInactive", -- string
-					highlight_tab_active = "NeoTreeTabActive", -- string
-					highlight_background = "NeoTreeTabInactive", -- string
-					highlight_separator = "NeoTreeTabSeparatorInactive", -- string
-					highlight_separator_active = "NeoTreeTabSeparatorActive", -- string
-				},
-				hijack_netrw_behavior = "open_current",
-				window = {
-					mappings = {
-						["O"] = "expand_all_nodes",
-					},
-				},
-			})
-		end,
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-			"MunifTanjim/nui.nvim",
-		},
-		keys = {
-			{ "<C-n>", ":Neotree float reveal toggle dir=%:p:h<cr>" },
-			{ "<C-n>b", ":Neotree float buffers<CR>" },
-			-- { "<C-n>.", ":Neotree float reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" },
-		},
-	},
 }

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

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

vim/.vim/lua/plugins/nvim-treesitter.lua

@@ -48,21 +48,6 @@ return {
 						if lang == "gdrama" then
 							return true
 						end
-						local file_too_large = require("utils").file_too_large
-
-						local fname = vim.api.nvim_buf_get_name(buf)
-
-						if file_too_large(fname) then
-							vim.schedule(function()
-								vim.notify(
-									string.format(
-										"Disabling treesitter for buffer. File %s exceeds maximum configured size.",
-										fname
-									)
-								)
-							end)
-							return true
-						end
 						return false
 					end,
 

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

@@ -0,0 +1,57 @@
+return {
+	"folke/paint.nvim",
+	config = function()
+		vim.api.nvim_set_hl(0, "NievesLightPurple", { fg = "#7f67c5" })
+		vim.api.nvim_set_hl(0, "NievesViolet", { fg = "#4000f0", bold = true })
+
+		require("paint").setup({
+			highlights = {
+				-- Highlight /** @something */
+				{
+					filter = { filetype = "java" },
+					pattern = "%*.-(@[%w_]+)%s?",
+					hl = "Constant",
+				},
+				-- Highlight /** @param something */
+				{
+					filter = { filetype = "java" },
+					pattern = "%*.*@param%s+([%w_+]+)%s?",
+					hl = "Identifier",
+				},
+				-- Highlight /** {@link} */
+				-- {
+				-- 	filter = { filetype = "java" },
+				-- 	pattern = "%*.*{%s?(@link)%s+[%w_+]+%s?}",
+				-- 	hl = "Red",
+				-- },
+				-- -- Highlight /** {@link something} */
+				-- {
+				-- 	filter = { filetype = "java" },
+				-- 	pattern = "%*.*{%s?@link%s+([%w_+]+)%s?}",
+				-- 	hl = "Yellow",
+				-- },
+				--
+				-- WASM
+				-- { pattern = "(W)ASM", hl = "LightRed", filter = {} },
+				-- { pattern = "W(A)SM", hl = "LightBlue", filter = {} },
+				-- { pattern = "WA(S)M", hl = "LightGreen", filter = {} },
+				-- { pattern = "WAS(M)", hl = "LightYellow", filter = {} },
+
+				-- Google
+				-- { pattern = "Google", hl = "LightBlue", filter = {} },
+				-- { pattern = "(G)oogle", hl = "LightBlue", filter = {} },
+				-- { pattern = "G(o)ogle", hl = "LightRed", filter = {} },
+				-- { pattern = "Go(o)gle", hl = "LightYellow", filter = {} },
+				-- { pattern = "Goo(g)le", hl = "LightBlue", filter = {} },
+				-- { pattern = "Goog(l)e", hl = "LightGreen", filter = {} },
+				-- { pattern = "Googl(e)", hl = "LightRed", filter = {} },
+
+				-- cnieves
+				-- { pattern = "cnieves", hl = "LightPurple", filter = {} },
+				-- { pattern = "Christian Nieves", hl = "LightPurple", filter = {} },
+				{ pattern = "Christian Nieves", hl = "NievesViolet", filter = {} },
+				{ pattern = "Christian Nieves", hl = "NievesLightPurple", filter = {} },
+			},
+		})
+	end,
+}

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

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

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

@@ -1,33 +1,63 @@
 return {
-	{
+	{ "ron-rs/ron.vim" },
-		"vxpm/ferris.nvim",
-		ft = "rust",
-		config = function()
-			local capabilities = vim.lsp.protocol.make_client_capabilities()
-			capabilities.offsetEncoding = { "utf-16" }
-			require("lspconfig").rust_analyzer.setup({
-				-- offset_encoding = "utf-8",
-				-- capabilities,
-				settings = { ["rust-analyzer"] = {} },
-			})
-		end,
-	},
-
 	{
 		"mrcjkb/rustaceanvim",
-		version = "^3", -- Recommended
+		version = vim.fn.has("nvim-0.10.0") == 0 and "^4" or false,
 		ft = { "rust" },
-		keys = {
+		config = function(_, opts)
-			{ "<leader>rd", ":RustLsp renderDiagnostic<CR>" },
+			vim.g.rustaceanvim = vim.tbl_deep_extend("keep", vim.g.rustaceanvim or {}, opts or {})
-			{ "<leader>ree", ":RustLsp explainError<CR>" },
+
-			{ "<leader>rem", ":RustLsp expandMacro<CR>" },
+			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",
-		ft = "rust",
+		event = { "BufRead Cargo.toml" },
-		version = "v0.3.0",
-		dependencies = { "nvim-lua/plenary.nvim" },
 		config = function()
 			require("crates").setup()
 		end,

vim/.vim/lua/plugins/scroll.lua

@@ -1,18 +1,4 @@
 return {
-	-- {
-	-- 	"dstein64/nvim-scrollview",
-	-- 	config = function()
-	-- 		require("scrollview").setup({
-	-- 			excluded_filetypes = { "nerdtree" },
-	-- 			current_only = true,
-	-- 			-- base = "buffer",
-	-- 			-- column = 80,
-	-- 			signs_on_startup = { "all" },
-	-- 			diagnostics_severities = { vim.diagnostic.severity.ERROR },
-	-- 		})
-	-- 	end,
-	-- },
-
 	{
 		"petertriho/nvim-scrollbar",
 		config = function()
@@ -30,22 +16,4 @@ return {
 		end,
 		lazy = false,
 	},
-	-- {
-	-- 	"kevinhwang91/nvim-hlslens",
-	-- 	config = function()
-	-- 		require("hlslens").setup({
-	-- 			nearest_only = true,
-	-- 			build_position_cb = function(plist, _, _, _)
-	-- 				require("scrollbar.handlers.search").handler.show(plist.start_pos)
-	-- 			end,
-	-- 		})
-	--
-	-- 		vim.cmd([[
-	--        augroup scrollbar_search_hide
-	--            autocmd!
-	--            autocmd CmdlineLeave : lua require('scrollbar.handlers.search').handler.hide()
-	--        augroup END
-	--    ]])
-	-- 	end,
-	-- },
 }

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

@@ -1,82 +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",
-	keys = {
+  -- stylua: ignore
-		{ "]d", "<plug>(signify-next-hunk)" },
+  keys = {
-		{ "[d", "<plug>(signify-prev-hunk)" },
+    { "]d",          "<plug>(signify-next-hunk)" },
-		{ "<leader>sd", ":SignifyDiff<CR>" },
+    { "[d",          "<plug>(signify-prev-hunk)" },
-		{ "<leader>sn", ":lua signify_normal()<CR>" },
+    { "<leader>sd",  ":SignifyDiff<CR>" },
-		{ "<leader>sup", ":lua signify_dtup()<CR>" },
+    { "<leader>sn",  ":lua signify_normal()<CR>" },
-		{ "<leader>sex", ":lua signify_dtex()<CR>" },
+    { "<leader>sup", ":lua signify_dtup()<CR>" },
-		{ "<leader>sp4", ":lua signify_dtp4()<CR>" },
+    { "<leader>sex", ":lua signify_dtex()<CR>" },
-	},
+    { "<leader>sp4", ":lua signify_dtp4()<CR>" },
-	config = function()
+    { "<leader>sb",  ":lua signify_dtp4()<CR>" },
-		vim.g.signify_vcs_list = { "hg", "git" }
+  },
-		local one_eighth = "▏"
+  config = function()
-		local one_quarter = "▎"
+    vim.g.signify_vcs_list = { "hg", "git" }
-		local three_eighths = "▍"
+    vim.g.signify_disable_by_default = 0
-		vim.g.signify_disable_by_default = 0
+    -- vim.g.signify_number_highlight = 1
-		vim.g.signify_sign_add = one_quarter
+    vim.g.signify_sign_show_count = 0
-		vim.g.signify_sign_delete = one_quarter
+    local s = "▕"
-		vim.g.signify_sign_change = one_quarter
+    vim.g.signify_sign_add = s
-		local red = "#f8a6a0"
+    vim.g.signify_sign_delete = s
-		vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cc9b8" })
+    vim.g.signify_sign_change = s
-		vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#84cee3" })
+    vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cd9b8" })
-		vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = red })
+    vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#849ee3" })
-		vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = red })
+
-		vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = red })
+    local myred = "#f296a0"
-		-- vim.cmd("highlight SignColumn ctermbg=NONE cterm=NONE guibg=NONE gui=NONE")
+    vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = myred })
-	end,
+    vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = myred })
+    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

@@ -1,19 +1,12 @@
 local use_google = require("utils").use_google
 local exec = require("utils").exec
 local TableConcat = require("utils").TableConcat
-local scopes = require("neoscopes")
 
 _G.find_files = function(search_dirs)
-	require("telescope.builtin").find_files({
+	require("telescope.builtin").find_files({ search_dirs = search_dirs })
-		search_dirs = search_dirs,
-	})
 end
 -- Helper functions to fetch the current scope and set `search_dirs`
-_G.find_dotfiles = function()
+_G.find_dotfiles = function() end
-	require("telescope.builtin").git_files({
-		cwd = vim.fn.expand("$HOME/dotfiles"),
-	})
-end
 
 _G.search_cwd = function()
 	local builtin = require("telescope.builtin")
@@ -21,64 +14,56 @@ _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,
-		-- search_dirs = ,
-	})
-end
-
 local function exe(cmd)
 	return vim.split(vim.fn.system(cmd), "\n")
 end
 
-local function get_visual_selection()
+local function fig_modified()
-	-- Yank current visual selection into the 'v' register
+	return exe("chg pstatus -ma -n --no-status --template= | sort")
-	--
-	-- Note that this makes no effort to preserve this register
-	vim.cmd('noau normal! "vy"')
-
-	return vim.fn.getreg("v")
 end
 
-function fig_modified()
+local function fig_all_modified()
-	return exe("hg pstatus -ma -n --no-status --template= | sort")
+	return exe("chg status -ma -n --rev p4base --no-status --template= | sort")
-end
-function fig_all_modified()
-	return exe("hg status -ma -n --rev p4base --no-status --template= | sort")
 end
 
+-- stylua: ignore
 local keys = {
-	{ "<leader>e", ":lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
+  { "<leader>e",  ":lua search_cwd()<CR>",                                                                    desc = "Find Files in Buffer Directory" },
-	{ "<leader>ts.", ":lua live_grep({vim.fn.getcwd()})<CR>", desc = "Search in CWD" },
+  { "<leader>tb", ":Telescope buffers<CR>" },
-	{ "<leader>ts", ':lua live_grep({vim.fn.expand("%%")})<CR>', desc = "Find Files in Buffer Directory" },
+  -- { "<leader>ts", require('telescope.builtin').live_grep },
-	{ "<leader>tc", ":Telescope textcase<CR>", desc = "Text case" },
+  -- { "<leader>TS", function() require('telescope.builtin').live_grep { default_text = vim.fn.expand("<cword>") } end, },
-	{ "<leader>tC", ":CritiqueCommentsTelescope<CR>", desc = "Critique comments" },
+  {
-	{ "<leader>tg", ":Telescope git_files<CR>", desc = "Git Files" },
+    "<leader>t.",
-	{ "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
+    function()
-	{ "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
+      require("telescope.builtin").git_files({
-	{ "<leader>to", ":Telescope oldfiles<CR>", desc = "Recent(oldfiles) Files" },
+        cwd = vim.fn.expand("$HOME/dotfiles"), })
-	{ "<leader>tn", ":Telescope notify<CR>", desc = "Notifications" },
+    end
-	{ "<leader>tr", ":Telescope resume<CR>", desc = "Telescope Resume" },
+    ,
-	--
+    desc = "Find Dotfiles"
-	-- { "<leader>tdc", ":Telescope dap commands" },
+  },
-	-- { "<leader>tdc", ":Telescope dap configurations" },
+  { "<leader>tC", ":Telescope textcase<CR>",                           desc = "Text case" },
+  { "<leader>tc", ":CritiqueCommentsTelescope<CR>",                    desc = "Critique all comments" },
+  { "<leader>tg", ":Telescope git_files<CR>",                          desc = "Git Files" },
+  { "<leader>tk", ":Telescope keymaps<CR>",                            desc = "Keymaps" },
+  { "<leader>tn", ":Telescope notify<CR>",                             desc = "Notifications" },
+  { "<leader>tr", ":Telescope resume<CR>",                             desc = "Telescope Resume" },
+  { "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
 }
 
 if use_google() then
-	TableConcat(keys, {
+	local find_files = require("telescope.builtin").find_files
-		{ "<leader>tm", ":lua find_files(fig_modified())<CR>" },
+	local cs_query = require("telescope").extensions.codesearch.find_query
-		{ "<leader>tM", ":lua find_files(fig_all_modified())<CR>" },
+  -- stylua: ignore
-		{ "<leader>tF", ":lua live_grep(fig_all_modified())<CR>", desc = "Search in *all* modified Fig files." },
+  TableConcat(keys, {
-		{ "<leader>tf", ":lua live_grep(fig_modified())<CR>", desc = "Search in modified Fig files." },
+    { "<leader>tm", function() find_files({ search_dirs = fig_modified() }) end,     desc = "list modified Fig files." },
-		{ "<C-P>", [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]], "n" },
+    { "<leader>tM", function() find_files({ search_dirs = fig_all_modified() }) end, desc = "List *all* modified Fig files" },
-		{ "<leader>cs", [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]] },
+    { "<leader>tf", function() find_files({ search_dirs = fig_modified() }) end,     desc = "Grep modified Fig files." },
-		{ "<leader>cs", [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]], mode = "v" },
+    { "<leader>tF", function() find_files({ search_dirs = fig_modified() }) end,     desc = "Grep *all* modified Fig files." },
-		{
+    { "<C-P>",      require("telescope").extensions.codesearch.find_files,           desc = "Code search files" },
-			"<leader>CS",
+    { "<leader>cs", require("telescope").extensions.codesearch.find_query,           desc = "Code search query" },
-			[[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
+    { "<leader>cs", cs_query,                                                        desc = "Code search query",             mode = "v" },
-		},
+    { "<leader>CS", function() cs_query({ default_text_expand = '<cword>' }) end,    desc = "Code search query <cword>" },
-	})
+  })
 end
 
 return {
@@ -105,6 +90,15 @@ return {
 			{ "?", "<cmd>lua require('actions-preview').code_actions()<cr>" },
 		},
 	},
+	{
+		"smartpde/telescope-recent-files",
+		config = function()
+			require("telescope").load_extension("recent_files")
+		end,
+		keys = {
+			{ "<leader>to", [[<cmd>lua require('telescope').extensions.recent_files.pick()<CR>]] },
+		},
+	},
 	{
 		"piersolenski/telescope-import.nvim",
 		dependencies = "nvim-telescope/telescope.nvim",
@@ -119,10 +113,34 @@ 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",
 		},
 		config = function()
@@ -159,19 +177,60 @@ return {
 						return path
 					end,
 					mappings = {
+						n = {
+							["<C-c>"] = "close",
+							["<Esc>"] = "close",
+						},
 						i = {
-							["<S-Down>"] = function()
+							-- ["<cr>"] = function(bufnr)
-								require("telescope.actions").cycle_history_next()
+							--   require("telescope.actions.set").edit(bufnr, "tab drop")
-							end,
+							-- end,
-							["<S-Up>"] = function()
+							["<C-c>"] = "close",
-								require("telescope.actions").cycle_history_prev()
+							["<Esc>"] = "close",
-							end,
+							["<S-Down>"] = "cycle_history_next",
+							["<S-Up>"] = "cycle_history_prev",
 						},
 					},
 				},
 				extensions = {
 					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
+						-- /google/.../w1/google3/my_file.cc becomes /google/.../w2/google3/my_file.cc,
+						transform_file_path = function(path)
+							local neocitc = require("neocitc")
+							local path_func = neocitc.path_in_current_workspace_or_head
+								or neocitc.path_in_current_workspace
+							return path_func(path)
+						end,
+						-- This is a useful option to speed up Telescope by avoiding the check
+						-- for file existence.
+						stat_files = false,
+						-- Ignore common patterns that can show up from other google plugins
+						ignore_patterns = {
+							"/%.git/COMMIT_EDITING$",
+							"/%.git/COMMIT_EDITMSG$",
+							"/%.git/MERGE_MSG$",
+							"^/tmp/%.pipertmp-",
+							"/Related_Files$",
+							"^term:",
+							";#toggleterm#",
+						},
 					},
 					persisted = {},
 					import = {

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

@@ -2,56 +2,77 @@ local use_google = require("utils").use_google
 
 return {
 	{
-		"sainnhe/sonokai",
+		"squk/ableton.nvim",
-		-- cond = false,
+		lazy = false,
-		config = function()
-			vim.g.sonokai_diagnostic_virtual_text = "highlighted"
-			vim.g.sonokai_style = "andromeda"
-			vim.g.sonokai_dim_inactive_windows = 1
-			-- vim.cmd("colorscheme sonokai")
-		end,
-	},
-	{
-		"nyoom-engineering/oxocarbon.nvim",
-		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
-		priority = 1000, -- make sure to load this before all the other start plugins
-		cond = false,
-		config = function()
-			vim.cmd("colorscheme oxocarbon")
-		end,
-	},
-	{
-		"uloco/bluloco.nvim",
-		dependencies = { "rktjmp/lush.nvim" },
-		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
-		priority = 1000, -- make sure to load this before all the other start plugins
-		cond = false,
-		config = function()
-			vim.cmd("colorscheme bluloco")
-		end,
-	},
-	{
-		"EdenEast/nightfox.nvim",
-		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
-		priority = 1000, -- make sure to load this before all the other start plugins
 		cond = not use_google(),
+		priority = 1000,
+		-- dir = "~/neovim-plugins/squk/ableton.nvim",
+		opts = {
+			variant = "cooler",
+		},
 		config = function()
-			-- vim.cmd("colorscheme nightfox")
+			vim.cmd("colorscheme ableton")
-			-- vim.cmd("colorscheme carbonfox")
-			-- vim.cmd("colorscheme terafox")
-			vim.cmd("colorscheme duskfox")
-			-- vim.cmd("colorscheme nordfox")
-			-- vim.cmd("colorscheme dayfox")
-			-- vim.cmd("colorscheme dawnfox")
 		end,
 	},
 	{
-		"rebelot/kanagawa.nvim",
+		"dgox16/oldworld.nvim",
-		lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
+		lazy = false,
-		priority = 1000, -- make sure to load this before all the other start plugins
+		cond = not use_google(),
-		cond = false,
+		priority = 1000,
+		opts = {
+			variant = "cooler",
+		},
 		config = function()
-			vim.cmd("colorscheme kanagawa-wave")
+			-- vim.cmd("colorscheme oldworld")
 		end,
 	},
+	{
+		"bluz71/vim-moonfly-colors",
+		name = "moonfly",
+		-- cond = not use_google(),
+		cond = false,
+		lazy = false,
+		priority = 1000,
+		config = function()
+			local custom_highlight = vim.api.nvim_create_augroup("CustomHighlight", {})
+			vim.api.nvim_create_autocmd("colorscheme", {
+				pattern = "moonfly",
+				callback = function()
+					local p = require("moonfly").palette
+					local unused = p.test
+					local highlights = { "", "VirtualText", "Underline", "Sign", "Floating" }
+					for _, h in ipairs(highlights) do
+						vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Error", { fg = p.crimson, bold = true })
+						vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Warn", { fg = p.yellow, bold = true })
+						vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Info", { fg = p.sky, bold = true })
+						vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Hint", { fg = p.turqoise, bold = true })
+						vim.api.nvim_set_hl(0, "Diagnostic" .. h .. "Ok", { fg = p.emerald, bold = true })
+					end
+				end,
+				group = custom_highlight,
+			})
+
+			vim.g.moonflyCursorColor = true
+			vim.g.moonflyItalics = true
+			vim.g.moonflyUnderlineMatchParen = true
+			vim.g.moonflyVirtualTextColor = true
+
+			vim.cmd("colorscheme moonfly")
+		end,
+	},
+	-- {
+	-- 	"EdenEast/nightfox.nvim",
+	-- 	lazy = use_google(), -- make sure we load this during startup if it is your main colorscheme
+	-- 	priority = 1000, -- make sure to load this before all the other start plugins
+	-- 	cond = not use_google(),
+	-- 	config = function()
+	-- 		-- vim.cmd("colorscheme nightfox")
+	-- 		-- vim.cmd("colorscheme carbonfox")
+	-- 		-- vim.cmd("colorscheme terafox")
+	-- 		vim.cmd("colorscheme duskfox")
+	-- 		-- vim.cmd("colorscheme nordfox")
+	-- 		-- vim.cmd("colorscheme dayfox")
+	-- 		-- vim.cmd("colorscheme dawnfox")
+	-- 	end,
+	-- },
 }

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

@@ -1,122 +1,93 @@
 local use_google = require("utils").use_google
 
 return {
-	{
+  {
-		"Shatur/neovim-ayu",
+    "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("ayu").setup({
+      -- require("onedark").setup()
-				mirage = false, -- Set to `true` to use `mirage` variant instead of `dark` for dark background.
+    end,
-				overrides = {}, -- A dictionary of group names, each associated with a dictionary of parameters (`bg`, `fg`, `sp` and `style`) and colors in hex.
+  },
-				-- vim.cmd("colorscheme ayu"),
+  {
-				-- vim.cmd("colorscheme ayu-mirage"),
+    "catppuccin/nvim",
-			})
+    name = "catppuccin",
-		end,
+    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
-	{
+    cond = use_google(),
-		"ramojus/mellifluous.nvim",
+    config = function()
-		priority = 1000, -- make sure to load this before all the other start plugins
+      vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
-		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+      local colors = require("catppuccin.palettes").get_palette()
-		cond = use_google(),
-		config = function()
-			require("mellifluous").setup({ --[[...]]
-			}) -- optional, see configuration section.
-			-- vim.cmd("colorscheme mellifluous")
-		end,
-	},
-	{
-		"ful1e5/onedark.nvim",
-		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
-		cond = use_google(),
-		config = function()
-			-- require("onedark").setup()
-		end,
-	},
-	{
-		"catppuccin/nvim",
-		name = "catppuccin",
-		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
-		cond = use_google(),
-		config = function()
-			vim.g.catppuccin_flavour = "mocha" -- latte, frappe, macchiato, mocha
-			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/plugins/whichkey.lua

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

vim/.vim/lua/utils.lua

@@ -1,112 +1,60 @@
 local M = {
-	use_google_cache = nil,
+  use_google_cache = nil,
+  flags = { 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.file_too_large(filename)
-	local max_filesize = 100 * 1024 -- 100 KB
-	local ok, stats = pcall(vim.loop.fs_stat, filename)
-	if ok and stats and stats.size > max_filesize then
-		return true
-	end
-	return false
-end
-
-function M.buf_too_large()
-	return M.file_too_large(vim.api.nvim_buf_get_name(vim.api.nvim_get_current_buf()))
 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/.vim/prefs/mappings.vim

@@ -1,7 +1,6 @@
-" DO NOT PLACE PLUGIN RELATED MAPPINGS HERE
-
 " jk is escape  -.-
 inoremap jk <esc>
+inoremap <space><space> <esc>:w<cr>
 
 " make tmux and vim play nicely together
 map <Esc>[A <Up>
@@ -12,8 +11,6 @@ map <Esc>[D <Left>
 " remove mapping to be used in nerdtree
 inoremap <Nul> <C-n>
 
-cnoremap %% <C-R>=fnameescape(expand("%:p:h")."/")<CR>
-
 " move vertically by visual line
 " nnoremap j gj
 " nnoremap k gk
@@ -45,63 +42,3 @@ nnoremap / /\v
 vnoremap / /\v
 
 nnoremap <silent> <leader>ww :call WindowSwap#EasyWindowSwap()<CR>
-
-function! s:createHabitsMappings(keys, message) abort
-    for key in a:keys
-        call nvim_set_keymap('n', key, ':call BreakHabitsWindow(' . string(a:message). ')<CR>', {'silent': v:true, 'nowait': v:true, 'noremap': v:true})
-    endfor
-endfunction
-
-function! BreakHabitsWindow(message) abort
-    " Define the size of the floating window
-    let width = 50
-    let height = 10
-
-    " Create the scratch buffer displayed in the floating window
-    let buf = nvim_create_buf(v:false, v:true)
-
-    " create the lines to draw a box
-    let horizontal_border = '+' . repeat('-', width - 2) . '+'
-    let empty_line = '|' . repeat(' ', width - 2) . '|'
-    let lines = flatten([horizontal_border, map(range(height-2), 'empty_line'), horizontal_border])
-    " set the box in the buffer
-    call nvim_buf_set_lines(buf, 0, -1, v:false, lines)
-
-    " Create the lines for the centered message and put them in the buffer
-    let offset = 0
-    for line in a:message
-        let start_col = (width - len(line))/2
-        let end_col = start_col + len(line)
-        let current_row = height/2-len(a:message)/2 + offset
-        let offset = offset + 1
-        call nvim_buf_set_text(buf, current_row, start_col, current_row, end_col, [line])
-    endfor
-
-    " Set mappings in the buffer to close the window easily
-    let closingKeys = ['<Esc>', '<CR>', '<Leader>']
-    for closingKey in closingKeys
-        call nvim_buf_set_keymap(buf, 'n', closingKey, ':close<CR>', {'silent': v:true, 'nowait': v:true, 'noremap': v:true})
-    endfor
-
-    " Create the floating window
-    let ui = nvim_list_uis()[0]
-    let opts = {'relative': 'editor',
-                \ 'width': width,
-                \ 'height': height,
-                \ 'col': (ui.width/2) - (width/2),
-                \ 'row': (ui.height/2) - (height/2),
-                \ 'anchor': 'NW',
-                \ 'style': 'minimal',
-                \ }
-    let win = nvim_open_win(buf, 1, opts)
-
-    " Change highlighting
-    " call nvim_win_set_option(win, 'winhl', 'Normal:ErrorFloat')
-
-    highlight CustomFloatingWindow ctermbg=11 guibg=black ctermfg=10 guifg=red
-    call nvim_win_set_option(win, 'winhl', 'Normal:CustomFloatingWindow')
-endfunction
-
-" let windowHabitsKeys = [":w<cr>"]
-" let windowHabitsMessage = ["USE < SPACE SPACE > INSTEAD", "BREAK BAD HABITS"]
-" call s:createHabitsMappings(windowHabitsKeys, windowHabitsMessage)

vim/.vimrc

@@ -2,24 +2,13 @@ set nocompatible              " be iMproved, required
 
 let mapleader="," " BEST LEADER OF ALL TIME (BLOT)
 filetype off                  " required
-set runtimepath+=,~/.vim
-set runtimepath+=,~/.vim/after
-set runtimepath+=,~/.vim/lua/
-set runtimepath+=,~/.config/nvim/after/
-let &runtimepath = &runtimepath
 
 set directory=/tmp
 set undofile
 set nobackup
 set formatoptions+=j
 set nowritebackup
-au BufWritePre * let &bex = '@' . strftime("%F.%H:%M")
-
 set termguicolors
-let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
-let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
-let &t_AB="\e[48;5;%dm"
-let &t_AF="\e[38;5;%dm"
 
 set laststatus=2
 set cmdheight=1
@@ -48,36 +37,16 @@ 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
 
-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
 set noscrollbind
 set expandtab
 
-" map <LeftMouse> ""
-map <LeftDrag> ""
-map <LeftRelease> ""
-
-set updatetime=100
-
-lua require('plugin_init')
-
-source ~/.vim/prefs/mappings.vim
-source ~/.vim/prefs/leader.vim
-
 set encoding=utf-8
-
 set t_Co=256
-
 let base16colorspace=256
 set colorcolumn=100
-
-if (has("termguicolors"))
- set termguicolors
-endif
 set background=dark
 let $NVIM_TUI_ENABLE_TRUE_COLOR=1
 
@@ -88,23 +57,6 @@ let g:lsp_log_file = expand('~/vim-lsp.log')
 "Don't ask to save when changing buffers (i.e. when jumping to a type definition)
 set hidden
 
-function! GenerateUnicode(first, last)
-  let i = a:first
-  while i <= a:last
-    if (i%256 == 0)
-      $put ='----------------------------------------------------'
-      $put ='     0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F '
-      $put ='----------------------------------------------------'
-    endif
-    let c = printf('%04X ', i)
-    for j in range(16)
-      let c = c . nr2char(i) . ' '
-      let i += 1
-    endfor
-    $put =c
-  endwhile
-endfunction
-
 " makes sure that when opening, files are normal, i.e. not folded.
 set nofoldenable
 
@@ -126,3 +78,8 @@ let g:loaded_remote_plugins    = 1
 
 filetype plugin indent on
 syntax on
+
+source ~/.vim/prefs/mappings.vim
+source ~/.vim/prefs/leader.vim
+source ~/.vim/prefs/mappings.vim
+source ~/.vim/prefs/leader.vim

zsh/.abbr.zsh

@@ -0,0 +1 @@
+ABBR_SET_LINE_CURSOR=1

zsh/.aliases.sh

@@ -1,46 +1,15 @@
-# alias go=colorgo
+export ABBR_QUIET=1
-# alias cd=pushd
-alias vim='nvim'
-alias vimdiff='nvim -d'
-# alias cat='bat'
-alias ls='exa'
-alias mux='tmuxinator'
-alias tmux='tmux -2'
-#alias go='grc -e go'
-
-# alias ls='ls -Gp'                    # Colorize the ls output ##
-# alias ll='ls -la'                    # Use a long listing format ##
-# alias l.='ls -d .*'                  # Show hidden files ##
-
 alias grep='grep --colour'
+# abbr cat='bat'
+# alias ls='exa'
+alias tmux='tmux -2'
 
+alias ..="cd .."
+alias vim="nvim"
 alias cp='cp -iv'                    # Preferred 'cp' implementation
 alias mv='mv -iv'                    # Preferred 'mv' implementation
 alias mkdir='mkdir -pv'              # Preferred 'mkdir' implementation
 
-alias cd..='cd ../'                  # Go back 1 directory level (for fast typers)
-alias ..='cd ../'                    # Go back 1 directory level
-alias ...='cd ../../'                # Go back 2 directory levels
-alias .3='cd ../../../'              # Go back 3 directory levels
-alias .4='cd ../../../../'           # Go back 4 directory levels
-alias .5='cd ../../../../../'        # Go back 5 directory levels
-alias .6='cd ../../../../../../'     # Go back 6 directory levels
-
-alias f='open -a Finder ./'          # f:            Opens current directory in MacOS Finder
-alias ~="cd ~"                       # ~:            Go Home
-
-alias numFiles='echo $(ls -1 | wc -l)'      # numFiles:     Count of non-hidden files in current dir
-alias make1mb='mkfile 1m ./1MB.dat'         # make1mb:      Creates a file of 1mb size (all zeros)
-alias make5mb='mkfile 5m ./5MB.dat'         # make5mb:      Creates a file of 5mb size (all zeros)
-alias make10mb='mkfile 10m ./10MB.dat'      # make10mb:     Creates a file of 10mb size (all zeros)
-
-# Recursive directory listing
-alias lr='ls -R | grep ":$" | sed -e '\''s/:$//'\'' -e '\''s/[^-][^\/]*\//--/g'\'' -e '\''s/^/   /'\'' -e '\''s/-/|/'\'' | less'
-
-
-# recursively  delete .DS_Store files
-alias ds_clean='find ./ -name ".DS_Store" -depth -exec rm {} \;'
-
 swap_files () {
   tmp_name=$(TMPDIR=$(dirname -- "$1") mktemp) &&
   mv -f -- "$1" "$tmp_name" &&
@@ -49,3 +18,4 @@ swap_files () {
 }
 
 function zipdiff() { diff -W200 -y <(unzip -vql "$1" | sort -k8) <(unzip -vql "$2" | sort -k8); }
+export ABBR_QUIET=0

zsh/.bash_profile

@@ -23,6 +23,8 @@ source ~/.aliases.sh
 if [[ -f "$HOME/use_google" ]]; then
     source $HOME/.bash_profile.google
 fi
-. "$HOME/.cargo/env"
 
 if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
+. "$HOME/.cargo/env"
+
+ulimit -n 10240

zsh/.bash_profile.google

@@ -1,12 +1,15 @@
+export ABBR_QUIET=1
 # vi: ft=sh
 # ---------------
 # Google Specific
 # ---------------
 export PATH=$PATH:/google/src/head/depot/google3/experimental/users/cnieves/util
 export PATH="${HOME}/.config/lsp/lua-language-server/bin:${PATH}"
-export XAUTHORITY=~/.Xauthority
+export PATH=$PATH:/${HOME}/nvim-linux-x86_64/bin/
-export GOROOT=/usr/lib/google-golang
 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
@@ -24,7 +27,6 @@ function gcert() {
   source /google/bin/releases/knock/knock.sh
 }
 
-
 FORTUNES=/google/data/ro/users/di/diamondm/engfortunes/fortune.sh
 if [ -f "$FORTUNES" ]; then
     prodcertstatus &> /dev/null && $FORTUNES
@@ -52,6 +54,8 @@ alias jadep=/google/data/ro/teams/jade/jadep
 alias replace_string=/google/src/head/depot/google3/devtools/scripts/replace_string
 alias safergcp=/google/bin/releases/safer-gcp/tools/safergcp
 alias add_deps_to_usages='/google/src/head/depot/google3/apps/framework/tools/add_deps_to_usages.sh'
+alias bloaty=/google/bin/releases/protobuf-team/bloaty/bloaty
+alias bloaty-google3-diff=/google/bin/releases/protobuf-team/bloaty/bloaty-google3-diff
 alias plxutil='/google/data/ro/teams/plx/plxutil'
 export HGSHORT_CMDS="cat head tail mv cp rm chmod g4 diff merge patch meld trim less more nvim"
 export HGSHORT_DIR='/google/src/head/depot/google3/experimental/fig_contrib/hgshort' # default
@@ -76,38 +80,11 @@ knock() {
     echo "ERROR: Cannot invoke knock before gcert has been run" >&2
   fi
 }
-
-sl() {
-  blaze build --config gmscore_arm64 //java/com/google/android/gmscore/$1:$2
-
-  # some targets end in ".apk", this prevents adding the suffix to targets that
-  # already have it
-  if [[ "$2" == *".apk"* ]]; then
-      adb install -d -r blaze-bin/java/com/google/android/gmscore/$1/$2
-  else
-      adb install -d -r blaze-bin/java/com/google/android/gmscore/$1/$2.apk
-  fi
-}
-
-sl_gms() {
-    sl integ GmsCore_prodnext_xxhdpi_debug
-}
-
 build_gms() {
   blaze build --config gmscore_arm64 //java/com/google/android/gmscore/integ:GmsCore_prodnext_xxhdpi_debug
 }
 
-cdm() {
+abbr cdm = "adb shell am start -n com.google.android.gms/.chimera.debug.ChimeraDebugActivity"
-    adb shell am start -n com.google.android.gms/.chimera.debug.ChimeraDebugActivity
-}
-
-cdp() {
-    adb shell am start -n com.google.android.gms/.chimera.multipackage.debug.MultiPackageDebugActivity
-}
-
-icdm() {
-    adb shell am start -n com.google.android.gms.isolated/com.google.android.gms.chimera.debug.ChimeraDebugActivity
-}
 
 jt() {
     if [[ $PWD =~ '(.*)/javatests(.*)' ]]; then
@@ -126,10 +103,6 @@ cl_search() {
     rg --ignore-case $1 $(hg pstatus -ma -n  --template= -- 2>/dev/null)
 }
 
-todos() {
-    cl_search "TODO"
-}
-
 cl_replace() {
     hg status -n --change . --template= | xargs -i sh -c "sed -i '$1' {}"
 }
@@ -139,11 +112,6 @@ restart_gms() {
     adb shell am broadcast -a com.google.android.gms.INITIALIZE
 }
 
-objfs_cp() {
-    tmp=$(mktemp) && \
-    fileutil cp -f $1 $tmp && unzip $tmp $2 && unlink $tmp
-}
-
 from_cloud(){
     scp baggins.c.googlers.com:$1 ~/Downloads/
     echo "Saved $1 to downloads"
@@ -182,3 +150,14 @@ alias bisect=/google/data/ro/teams/tetralight/bin/bisect
 alias copybara='/google/bin/releases/copybara/public/copybara/copybara'
 alias allow_ptrace='/google/bin/releases/cider/dbg/allow_ptrace'
 alias bluze=/google/bin/releases/blueprint-bluze/public/bluze
+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

@@ -1,6 +1,8 @@
 # set -xv
 HISTSIZE=10000000
 SAVEHIST=10000000
+CASE_SENSITIVE="true" # speeds up tab autocomplete
+zstyle ':completion:*:hosts' hosts
 
 alias cd pushd
 
@@ -27,16 +29,17 @@ zplug "plugins/docker",   from:oh-my-zsh;
 zplug "plugins/rsync",   from:oh-my-zsh;
 zplug "plugins/safepaste",   from:oh-my-zsh;
 zplug "mattberther/zsh-pyenv"
+zplug "olets/zsh-abbr"
+zplug "olets/zsh-autosuggestions-abbreviations-strategy"
 
 zplug "Tarrasch/zsh-autoenv" # Expects .autoenv.zsh or .autoenv_leave.zsh
 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 "modules/completion", from:prezto
 zplug "romkatv/powerlevel10k", as:theme, depth:1
-# zplug "stedolan/jq", from:gh-r, as:command, rename-to:jq
 
 # Install plugins if there are plugins that have not been installed
 if ! zplug check --verbose; then
@@ -49,6 +52,9 @@ fi
 # Then, source plugins and add commands to $PATH
 zplug load
 
+ZSH_AUTOSUGGEST_STRATEGY=( abbreviations $ZSH_AUTOSUGGEST_STRATEGY )
+source ~/.abbr.zsh
+
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
 # Initialization code that may require console input (password prompts, [y/n]
@@ -72,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
@@ -93,8 +99,8 @@ bindkey '^[^?' backward-kill-word
 # bindkey "^[[B" down-history
 # bindkey "^[[A" history-beginning-search-backward
 # bindkey "^[[B" history-beginning-search-forward
-bindkey "^[[A" history-substring-search-up
+bindkey '^[[A' history-substring-search-up
-bindkey "^[[B" history-substring-search-down
+bindkey '^[[B' history-substring-search-down
 # Put standard ANSI color codes in shell parameters for easy use.
 # Note that some terminals do not support all combinations.
 
@@ -153,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*(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