simplify google

config/.config/nvim/init.lua

@@ -13,18 +13,24 @@ end
 vim.opt.rtp:prepend(lazypath)
 vim.opt.rtp:prepend(vim.env.HOME .. "/.vim")
 vim.opt.rtp:prepend(vim.env.HOME .. "/.vim/lua")
-vim.opt.rtp:prepend(vim.env.HOME .. "/.vim/lua")
 
 package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua"
 
-local plugins = {
-  -- this entry tells lazy.nvim to load the list of of *.lua files from plugins/
-  { import = "plugins" },
-}
 require("config.clipboard")
 require("config.tmpl")
 require("config.zip")
 
-require("lazy").setup(plugins)
+require("lazy").setup({
+  -- this entry tells lazy.nvim to load the list of of *.lua files from plugins/
+   import = "plugins" ,
+  -- Dev configuration
+  dev = {
+    -- Directory where you store your local plugin projects
+    path = "~/neovim-plugins/squk/",
+    -- @type string[] plugins that match these patterns will use your local versions instead of being fetched from GitHub
+    patterns = { "squk" },
+    fallback = false, -- Fallback to git when local plugin doesn't exist
+  },
+})
 
 vim.opt.undodir = vim.fn.expand("$HOME") .. "/.undo/"

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

@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }
+  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }
 }

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

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

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

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

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

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

@@ -25,6 +25,7 @@ return {
   {
     "MagicDuck/grug-far.nvim",
     config = function()
+      vim.g.maplocalleader = ","
       require("grug-far").setup({
         -- search and replace engines configuration
         engines = {
@@ -32,7 +33,7 @@ return {
           ripgrep = {
             -- ripgrep executable to use, can be a different path if you need to configure
             path = "rg",
-						extraArgs = "--.",
+            -- extraArgs = "-.",
           },
         },
       })
@@ -68,16 +69,6 @@ return {
       },
     },
   },
-	{
-		"Bekaboo/dropbar.nvim",
-		-- optional, but required for fuzzy finder support
-		dependencies = {
-			"nvim-telescope/telescope-fzf-native.nvim",
-		},
-		config = function()
-			vim.ui.select = require("dropbar.utils.menu").select
-		end,
-	},
   "RRethy/vim-illuminate",
   "kdheepak/lazygit.nvim",
   "flwyd/vim-conjoin",
@@ -89,7 +80,7 @@ return {
   { "nvim-lua/plenary.nvim",    lazy = false },
   { "squk/java-syntax.vim",     ft = "java" },
   { "udalov/kotlin-vim",        event = "VeryLazy",                        ft = "kotlin" },
-	-- { "andymass/vim-matchup", event = "VimEnter" },
+  { "andymass/vim-matchup",     event = "VimEnter" },
   { "jghauser/mkdir.nvim",      event = "BufWritePre" },
   {
     "rmagatti/auto-session",

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

@@ -8,9 +8,12 @@ return {
     version = "*",
     -- lazy.nvim will automatically load the plugin when it's required by blink.cmp
     lazy = true,
-		-- make sure to set opts so that lazy.nvim calls blink.compat's setup
-		opts = {},
     cond = flags.blink,
+    -- make sure to set opts so that lazy.nvim calls blink.compat's setup
+    opts = {
+      impersonate_nvim_cmp = true,
+      debug = true,
+    },
   },
   {
     "saghen/blink.cmp",
@@ -18,12 +21,12 @@ return {
     cond = flags.blink,
     dependencies = {
       "Exafunction/codeium.nvim",
-			"mikavilpas/blink-ripgrep.nvim",
-			"hrsh7th/cmp-cmdline",
-			-- "FelipeLema/cmp-async-path",
       "chrisgrieser/cmp-nerdfont",
-			"hrsh7th/cmp-emoji",
+      "hrsh7th/cmp-nvim-lsp",
+      "mikavilpas/blink-ripgrep.nvim",
+      "moyiz/blink-emoji.nvim",
       "rafamadriz/friendly-snippets", -- optional: provides snippets for the snippet source
+      "saghen/blink.compat",
     },
     version = "v0.*", -- use a release tag to download pre-built binaries
     -- build = 'cargo build --release',
@@ -31,7 +34,9 @@ return {
     ---@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" },
@@ -50,14 +55,12 @@ return {
           local providerToEnable = {
             "lsp",
             "path",
-						"crates",
             "snippets",
             "ripgrep",
             "emoji",
             "nerdfont",
             "buffer",
           }
-					print(vim.inspect(providerToEnable))
           if use_google() then
             table.insert(providerToEnable, "nvim_ciderlsp")
             table.insert(providerToEnable, "buganizer")
@@ -66,11 +69,11 @@ return {
           end
           return providerToEnable
         end,
-			},
+        -- default = { "lsp" },
         providers = {
+          lsp = { name = "LSP", module = "blink.cmp.sources.lsp", score_offset = 90 },
           -- dont show LuaLS require statements when lazydev has items
-				lsp = { fallback_for = { "lazydev" } },
+          lazydev = { name = "LazyDev", module = "lazydev.integrations.blink", fallbacks = { "lsp" } },
-				lazydev = { name = "LazyDev", module = "lazydev.integrations.blink" },
           ripgrep = {
             module = "blink-ripgrep",
             name = "Ripgrep",
@@ -84,30 +87,62 @@ return {
               additional_rg_options = {},
             },
           },
-				nvim_ciderlsp = {
+          -- https://github.com/moyiz/blink-emoji.nvim
-					name = "nvim_ciderlsp",
+          emoji = {
-					module = "blink.compat.source",
+            module = "blink-emoji",
+            name = "Emoji",
+            score_offset = 15,  -- the higher the number, the higher the priority
+            opts = { insert = true }, -- Insert emoji (default) or complete its name
           },
-				buganizer = {
+          buffer = {
-					name = "nvim_buganizer",
+            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",
           },
           codeium = {
             name = "codeium",
             module = "blink.compat.source",
+            score_offset = 100,
+          },
+          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 = {
+        list = {
+          -- stylua: ignore
+          selection = {
+            preselect = function(ctx) return ctx.mode ~= 'cmdline' end,
+            auto_insert = function(ctx) return ctx.mode ~= 'cmdline' end,
+          },
+        },
+        documentation = {
+          auto_show = true,
+        },
+        -- Displays a preview of the selected item on the current line
+        ghost_text = {
+          enabled = true,
+        },
         trigger = {
           show_on_x_blocked_trigger_characters = { "'", '"', "(", "{" },
         },
-				menu = {
-					draw = {
-						-- columns = { { "label", "label_description", gap = 1 }, { "kind_icon", "kind" } },
-					},
-				},
       },
     },
 

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

@@ -2,10 +2,9 @@ return {
   {
     "akinsho/bufferline.nvim",
     version = "*",
-		dependencies = "nvim-tree/nvim-web-devicons",
+    cond = false,
-		config = function()
+    dependencies = { "nvim-tree/nvim-web-devicons" },
-			vim.opt.termguicolors = true
+    opts = {
-			require("bufferline").setup({
       options = {
         hover = {
           enabled = true,
@@ -24,7 +23,7 @@ return {
             separator = true, -- use a "true" to enable the default, or set your own character
           },
         },
-					mode = "tabs",
+        -- mode = "tabs",
         diagnostics = "nvim_lsp",
         diagnostics_indicator = function(count, level, diagnostics_dict, context)
           local symbols = { error = " ", warning = " ", info = " ", hint = "󱠂 " }
@@ -35,8 +34,39 @@ return {
         truncate_name = false,
         show_close_icon = false,
         show_buffer_close_icons = false,
+        groups = {
+          options = {
+            toggle_hidden_on_enter = true, -- when you re-enter a hidden group this options re-opens that group so the buffer is visible
           },
-			})
+          items = {
+            {
+              name = "Tests", -- Mandatory
+              highlight = { sp = "lightblue" }, -- Optional
+              priority = 2, -- determines where it will appear relative to other groups (Optional)
+              icon = " ", -- Optional
+              matcher = function(buf) -- Mandatory
+                return buf.path:match("%_test.cc$") or buf.path:match("%Test.java$")
               end,
             },
+            {
+              name = "Docs",
+              highlight = { sp = "lightgreen" },
+              auto_close = false, -- whether or not close this group if it doesn't contain the current buffer
+              matcher = function(buf)
+                return buf.path:match("%.md$") or buf.path:match("%.txt$")
+              end,
+            },
+            {
+              name = "Lua",
+              highlight = { sp = "lightblue" },
+              auto_close = false, -- whether or not close this group if it doesn't contain the current buffer
+              matcher = function(buf)
+                return buf.path:match("%.lua$")
+              end,
+            },
+          },
+        },
+      },
+    },
+  },
 }

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

@@ -59,7 +59,7 @@ return {
 				gdscript = { "gdformat" },
 				dashboard = {},
 				-- Use the "*" filetype to run formatters on all filetypes.
-        ["*"] = { "codespell" },
+				-- ["*"] = { "codespell" },
 				-- Use the "_" filetype to run formatters on filetypes that don't
 				-- have other formatters configured.
 				["_"] = { "trim_whitespace" },

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,19 @@
 -- disable underline
 vim.diagnostic.handlers.underline.show = function() end
 
+local signs = {
+	Error = " ",
+	Warning = " ",
+	Warn = " ",
+	Hint = "",
+	Info = " ",
+	Other = "",
+}
+for type, icon in pairs(signs) do
+	local hl = "DiagnosticSign" .. type
+	vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+end
+
 return {
 	{
 		"folke/trouble.nvim",
@@ -11,32 +24,46 @@ return {
 				use_diagnostic_signs = true, -- enabling this will use the signs defined in your lsp client
 			})
 		end,
+    -- stylua: ignore
 		keys = {
-			{ "<leader>xt", "<cmd>:Telescope diagnostics<CR>" },
+			{ "<leader>xt", ":Telescope diagnostics<CR>" },
 			{ "gr", ":Telescope lsp_references<CR>" },
-			{ "<leader>xd", ":Trouble<CR>" },
+			{ "<leader>xd", ":Trouble diagnostics toggle <CR>" },
-			{ "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
+			{ "<leader>xbd", ":Trouble diagnostics toggle filter.buf=0<CR>" },
-			{ "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
+			{ "<leader>xe", ":Trouble diagnostics toggle filter.severity=vim.diagnostic.severity.ERROR<CR>" },
+			{ "[g", ":lua vim.diagnostic.goto_prev()<CR>" },
+			{ "]g", ":lua vim.diagnostic.goto_next()<CR>" },
 		},
 	},
+	-- {
+	-- 	"rachartier/tiny-inline-diagnostic.nvim",
+	-- 	event = "LspAttach",
+	-- 	priority = 1000, -- needs to be loaded in first
+	-- 	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,
+	-- },
 	{
-		"https://git.sr.ht/~whynothugo/lsp_lines.nvim",
+		"ErichDonGubler/lsp_lines.nvim",
 		event = { "LspAttach" },
 		name = "lsp_lines.nvim",
 		config = function()
-			local signs = {
-				Error = " ",
-				Warning = " ",
-				Warn = " ",
-				Hint = "",
-				Info = " ",
-				Other = "",
-			}
-			for type, icon in pairs(signs) do
-				local hl = "DiagnosticSign" .. type
-				vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
-			end
-
 			require("lsp_lines").setup()
 
 			-- vim.schedule(function()

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

@@ -27,14 +27,9 @@ return {
 	glug("googler", {
 		event = "VeryLazy",
 	}),
-	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 = {} }),
 
@@ -48,7 +43,6 @@ return {
 	-- Set up syntax, indent, and core settings for various filetypes
 	superlazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })),
 	-- superlazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })),
-	superlazy(glug("ft-gcl", { event = "BufRead,BufNewFile *.gcl" })),
 	superlazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })),
 	superlazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
 	superlazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
@@ -182,9 +176,6 @@ return {
 			"BlazeDebugFinish",
 			"BlazeDepsUpdate",
 		},
-		config = function()
-			require("config.blaze")
-		end,
 		keys = function()
 			local function runCommandWithTarget(cmd)
 				return function()
@@ -251,17 +242,11 @@ return {
 		name = "cmp-nvim-ciderlsp",
 		url = "sso://googler@user/piloto/cmp-nvim-ciderlsp",
 		event = "VimEnter",
-		dependencies = {
-			"hrsh7th/nvim-cmp",
-		},
 	},
 	{
 		name = "ciderlsp-nvim",
 		url = "sso://googler@user/kdark/ciderlsp-nvim",
 		event = "VimEnter",
-		dependencies = {
-			"hrsh7th/nvim-cmp",
-		},
 	},
 	-- {
 	--     name = "nvim_figtree",
@@ -271,8 +256,7 @@ return {
 		name = "telescope_codesearch",
 		url = "sso://googler@user/vintharas/telescope-codesearch.nvim",
 		dependencies = { "nvim-telescope/telescope.nvim" },
-		config = function()
+		config = function() end,
-		end,
 	},
 	{
 		name = "telescope_citc",

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

@@ -2,24 +2,17 @@ local use_google = require("utils").use_google
 local flags = require("utils").flags
 
 return {
-	{
+  -- {
-		"ray-x/lsp_signature.nvim",
+  -- 	"ray-x/lsp_signature.nvim",
-		event = "VeryLazy",
+  -- 	event = "VeryLazy",
-		opts = {
+  -- 	opts = {
-			floating_window = true,
+  -- 		floating_window = true,
-			hint_prefix = "󰡱 ",
+  -- 		hint_prefix = "󰡱 ",
-		},
+  -- 	},
-		config = function(_, opts)
+  -- 	config = function(_, opts)
-			require("lsp_signature").setup(opts)
+  -- 		require("lsp_signature").setup(opts)
-		end,
+  -- 	end,
-	},
+  -- },
-	{
-		"luozhiya/lsp-virtual-improved.nvim",
-		event = { "LspAttach" },
-		config = function()
-			require("lsp-virtual-improved").setup()
-		end,
-	},
   {
     "kosayoda/nvim-lightbulb",
     commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
@@ -96,24 +89,25 @@ return {
     "neovim/nvim-lspconfig",
     dependencies = {
       "hrsh7th/nvim-cmp",
+      "saghen/blink.cmp",
+      "saghen/blink.compat",
       "nvim-lua/lsp-status.nvim",
       "VonHeikemen/lsp-zero.nvim",
     },
-  -- stylua: ignore
     keys = {
-			{ "<leader>F", "<cmd>lua vim.lsp.buf.format()<CR>" },
+      { "<leader>F",  ":lua vim.lsp.buf.format()<CR>" },
-
+      { "<leader>rn", ":lua vim.lsp.buf.rename()<CR>" },
-			{ "<leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>" },
+      { "L",          ":lua vim.lsp.buf.hover()<CR>" },
-			{ "L", "<cmd>lua vim.lsp.buf.hover()<CR>" },
+      { "gr",         ":Telescope lsp_references<CR>" },
-			{ "gr", "<Cmd>Telescope lsp_references<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" },
     },
     config = function()
       local lsp_status = require("lsp-status")
@@ -127,8 +121,21 @@ return {
 
       local lspconfig = require("lspconfig")
       local configs = require("lspconfig.configs")
-			require("config.lsp-google").setup(capabilities)
 
+      local nvim_lspconfig = require("lspconfig")
+      local lsp_configs = require("lspconfig.configs")
+
+      lsp_configs.ciderlsp = {
+        default_config = {
+          cmd = { '/google/bin/releases/cider/ciderlsp/ciderlsp', '--tooltag=nvim-lsp', '--noforward_sync_responses' },
+          filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "typescript" },
+          offset_encoding = 'utf-8',
+          root_dir = nvim_lspconfig.util.root_pattern('.citc'),
+          settings = {},
+        }
+      }
+
+      nvim_lspconfig.ciderlsp.setup {}
       -- Godot
       lspconfig.gdscript.setup({
         -- flags = {

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

@@ -1,46 +1,3 @@
-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",
   lazy = false,
@@ -52,16 +9,16 @@ return {
         theme = "auto",
         globalstatus = false,
         refresh = {
-					statusline = 1000,
+          statusline = 100,
-					-- tabline = 1000,
+          tabline = 100,
-					winbar = 1000,
+          winbar = 100,
         },
       },
       sections = {
         lualine_a = { "mode" },
-				lualine_b = { "branch", "diff", getCitc, isCiderLspAttached },
+        lualine_b = { "branch", "diff" },
         lualine_c = {
-					getLightbulb,
+          require("nvim-lightbulb").get_status_text,
           {
             "filename",
             path = 4, -- 0 = just filename, 1 = relative path, 2 = absolute path

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

@@ -10,7 +10,7 @@ return {
 		dependencies = {
 			"nvim-lua/plenary.nvim",
 			"MunifTanjim/nui.nvim",
---			"~/cmdtree",
+			--			"~/cmdtree",
 		},
 		cmd = {
 			"Neotree",
@@ -47,10 +47,8 @@ return {
 				-- return { "<C-n>.", ":Neotree toggle reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" }
 				return { "<C-n>m", ":Neotree float git_status<CR>", desc = "Open NeoTree CWD float" }
 			end)(),
-			-- { "<C-n>b", ":Neotree float buffers<CR>" },
+			{ "<C-n>", ":Neotree toggle left dir=%:p:h<cr>" },
-			{ "<C-n>f", ":Neotree float dir=%:p:h<cr>" },
+			{ "<leader>e", ":Neotree float dir=%:p:h<cr>/" },
-			{ "<C-n>", ":Neotree toggle dir=%:p:h<cr>" },
-			-- { "<C-n>.", ":Neotree reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" },
 		},
 	},
 }

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

@@ -3,6 +3,9 @@ return {
 		"mrcjkb/rustaceanvim",
 		version = "^5", -- Recommended
 		lazy = false, -- This plugin is already lazy
+		keys = {
+			-- { "" },
+		},
 	},
 	{
 		"saecki/crates.nvim",

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

@@ -65,19 +65,18 @@ return {
 	},
 	config = function()
 		vim.g.signify_vcs_list = { "hg", "git" }
-		local one_eighth = "▏"
-		local one_quarter = "▎"
-		local three_eighths = "▍"
 		vim.g.signify_disable_by_default = 0
-		vim.g.signify_sign_add = one_quarter
+		-- vim.g.signify_number_highlight = 1
-		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, "SignifySignChange", { fg = "#849ee3" })
+
+		local red = "#f896a0"
 		vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = red })
 		vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = red })
 		vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = red })
-		-- vim.cmd("highlight SignColumn ctermbg=NONE cterm=NONE guibg=NONE gui=NONE")
 	end,
 }

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

@@ -38,8 +38,9 @@ end
 
 -- stylua: ignore
 local keys = {
-  { "<leader>e",  ":lua search_cwd()<CR>",                                                                           desc = "Find Files in Buffer Directory" },
+  -- { "<leader>e",  ":lua search_cwd()<CR>",                                                                           desc = "Find Files in Buffer Directory" },
   { "<leader>ts", require('telescope.builtin').live_grep },
+  { "<leader>tb", ":Telescope buffers<CR>" },
   { "<leader>TS", function() require('telescope.builtin').live_grep { default_text = vim.fn.expand("<cword>") } end, },
   {
     "<leader>t.",

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

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

vim/.vim/lua/utils.lua

@@ -1,8 +1,6 @@
 local M = {
   use_google_cache = nil,
-	flags = {
+  flags = { blink = true },
-		blink = true,
-	},
 }
 
 function M.exec(command, args)

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>

zsh/.bash_profile.google

@@ -152,3 +152,9 @@ source /google/bin/releases/gmscore-tools/cli/prod/setup_prod_gms.sh
 abbr bq="blaze query"
 abbr br="blaze run"
 abbr bb="blaze build"
+
+function phenodb() {
+  adb shell sqlite3 /data/data/com.google.android.gms/databases/phenotype.db "'$*'"
+}
+
+export PHENOTYPE_PACKAGE_NAME="com.google.YOUR.PHENOTYPE.PACKAGE.NAME"

zsh/g3path.zsh

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