goose

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/after/ftplugin/go.vim

@@ -1,3 +1,7 @@
 set tabstop=2
-set softtabstop=2
 set shiftwidth=2
+set softtabstop=2
+set expandtab
+
+set textwidth=80
+set colorcolumn=80

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

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

ssh/.ssh/ssh/config

@@ -1,27 +0,0 @@
-Host workstation
-    Hostname cnieves.aus.corp.google.com
-    User cnieves
-    LocalForward 5005 localhost:5005 # Java Debug
-    RemoteForward 5037 localhost:5037 # ADB
-    RemoteForward 2222 localhost:22 # SSH/SCP
-    RemoteForward 2489 localhost:2489 # Lemonade
-    Compression no
-    ControlMaster auto
-    ControlPath /tmp/ssh_control-%r-%h-%p
-    ControlPersist 5m
-
-Host vilya
-    Hostname vilya.c.googlers.com
-    User cnieves
-    LocalForward 5005 localhost:5005 # Java Debug
-    RemoteForward 5037 localhost:5037 # ADB
-    RemoteForward 2222 localhost:22 # SSH/SCP
-    RemoteForward 2489 localhost:2489 # Lemonade
-    Compression yes
-    ControlMaster auto
-    ControlPath /tmp/ssh_control-%r-%h-%p
-    ControlPersist 5m
-
-Host gateway-workaround
-    Hostname cnieves.aus.corp.google.com
-    ProxyCommand /usr/local/bin/corp-ssh-helper -relay=sup-ssh-relay.corp.google.com -enable_measurements -report_measurement_results -proxy-mode=grue -dst_username=%r %h %p

ssh/.ssh/ssh/id_ed25519

@@ -1,7 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACAiobqOMGqa/WV98SogFgRxmR8piZIjB9YHv+EaKOszPwAAAJgwYgAoMGIA
-KAAAAAtzc2gtZWQyNTUxOQAAACAiobqOMGqa/WV98SogFgRxmR8piZIjB9YHv+EaKOszPw
-AAAEDCx1cXVSYtGOaZ3eY5Pi+vxI8IFQePfbR6anh7EIXnQSKhuo4wapr9ZX3xKiAWBHGZ
-HymJkiMH1ge/4Roo6zM/AAAAE2NocmlzdGlhbkBuaWV2ZXMuaW8BAg==
------END OPENSSH PRIVATE KEY-----

ssh/.ssh/ssh/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICKhuo4wapr9ZX3xKiAWBHGZHymJkiMH1ge/4Roo6zM/ christian@nieves.io

ssh/.ssh/ssh/known_hosts

@@ -1,6 +0,0 @@
-|1|CIIWBGAPZWh0AC6+VhzGeTCp2zU=|tvDRuKqQI9R5hYflMTFC0UjxSLg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
-|1|2zYwaWz04YT0n3X4DoUJ/GyfvJc=|qEkYdDiBbUaZBIJuJgSjpgAIIcc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
-|1|kyd+2TLRVx5WkeYWt5KZG5xkiRY=|Av44XxYX/tB5AylJYGwe1+aYRH8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-|1|57Mc7AkMixA2wO/oaXe0kDmn7bk=|WEvNB7cfFsTcYNQSk2tRgin+mfg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXuVwIE9ZFHrqkRqzCToEwBR4V+1YoBZf+7PwQOm9uo
-|1|Gc8JQLe9H1GKkfEpatYPwqaM5u0=|CsQrFpSf02UbF27MlvOQB0enGuQ= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCaRpBbAotScjprZd4DSlGw6FVRobxdo5YX1LLl9yoIhBfXXQIIHvYq3sRnS9GhhOBhoEBcqOZm7jj4GG8TnnANYEAoulR0dfGLAZbftpz95wNaWo9veiA45k8Ihx5fpZ2c0WlJnTZYyz+0+WaL3AY7yz7p1gyfTYOWp7Q4LJcY4kK/tkLnMYSsCTGwMAco2jR9CDdXZGLdAVB4BoZOAEYJ3wUGWCxcFMVgy+X7iQwIkrNyRCBw/BV3EjXqSNjD/XbrsMfuiVhhDgZS7r+u+yQCxqFu60OOLCXU9++UgKy2ICVDP8mBoJW/zKvJ0OOoylt7vSVWp67uiHe7f/0rywN1
-|1|wBajkjvDTSC0NG6PWiSGhwPPhdY=|USSmnu2FmIcv4gzM4t4+3+RoBV8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA8e+6iO+UmorfX7JWKglc4QptEczpe2LG3PidmsS7tDPcUK9Vbn/eyEkY61Us1Zo7rGqrAT3wABOnRpftfg0IA=

ssh/.ssh/ssh/known_hosts.old

@@ -1,4 +0,0 @@
-|1|CIIWBGAPZWh0AC6+VhzGeTCp2zU=|tvDRuKqQI9R5hYflMTFC0UjxSLg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
-|1|2zYwaWz04YT0n3X4DoUJ/GyfvJc=|qEkYdDiBbUaZBIJuJgSjpgAIIcc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
-|1|kyd+2TLRVx5WkeYWt5KZG5xkiRY=|Av44XxYX/tB5AylJYGwe1+aYRH8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-|1|57Mc7AkMixA2wO/oaXe0kDmn7bk=|WEvNB7cfFsTcYNQSk2tRgin+mfg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXuVwIE9ZFHrqkRqzCToEwBR4V+1YoBZf+7PwQOm9uo

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

@@ -0,0 +1,35 @@
+local use_google = require("utils").use_google
+
+return {
+	{
+		"yetone/avante.nvim",
+		build = "make",
+		enable = true,
+		branch = "working",
+		dependencies = {
+			"nvim-treesitter/nvim-treesitter",
+			"stevearc/dressing.nvim",
+			"nvim-lua/plenary.nvim",
+			"MunifTanjim/nui.nvim",
+			-- Add vintharas/avante-goose.nvim as a dependecy to avante.nvim
+			-- That'll ensure that you'll load avante-goose when you load avante.
+			{
+				"vintharas/avante-goose.nvim",
+				url = "sso://user/vintharas/avante-goose.nvim",
+				cond = use_google(),
+				opts = {
+					model = "gemini-for-google-2.5-pro", -- Select model from go/goose-models.
+				},
+			},
+		},
+		opts = {
+			provider = "goose", -- Select goose as provider
+			vendors = {}, -- Makes sure there's a vendors table
+		},
+		config = function(_, opts)
+			-- Load provider from the plugin
+			opts.vendors["goose"] = require("avante-goose").getProvider()
+			require("avante").setup(opts)
+		end,
+	},
+}

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

@@ -1,6 +1,20 @@
 local use_google = require("utils").use_google
 
 return {
+    {
+    "folke/flash.nvim",
+    event = "VeryLazy",
+    ---@type Flash.Config
+    opts = {},
+    -- stylua: ignore
+    keys = {
+      { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" },
+      { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" },
+      { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" },
+      { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
+      { "<c-s>", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" },
+    },
+  },
   "tikhomirov/vim-glsl",
   "sindrets/diffview.nvim",
   { "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },

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

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

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

@@ -15,51 +15,6 @@ local kind_icons = {
 }
 
 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",
-								},
-							},
-						},
-					},
-				},
-				-- Your configuration options here
-				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,
-	},
 	{
 		"saghen/blink.compat",
 		-- use the latest release, via version = '*', if you also use the latest release for blink.cmp
@@ -122,11 +77,14 @@ return {
 						"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
@@ -147,12 +105,13 @@ return {
 							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 = 15, -- the higher the number, the higher the priority
+						score_offset = 1, -- the higher the number, the higher the priority
 						opts = { insert = true }, -- Insert emoji (default) or complete its name
 					},
 					buffer = {
@@ -167,12 +126,20 @@ return {
 					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",

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

@@ -1,5 +1,16 @@
 local use_google = require("utils").use_google
 
+return {
+  {
+    "stevearc/conform.nvim",
+    event = { "BufWritePre" },
+    cmd = { "ConformInfo", "FormatDisable", "FormatEnable" },
+    keys = {
+      -- stylua: ignore
+      { "<leader>fmt", function() require("conform").format({ async = true, lsp_fallback = true }) end, mode = "", desc = "Format buffer", },
+      { "<leader>fj",  ":%!python -m json.tool" },
+    },
+    config = function()
       vim.g.disable_autoformat = false
       vim.api.nvim_create_user_command("FormatDisable", function(args)
         if args.bang then
@@ -38,26 +49,14 @@ vim.api.nvim_create_user_command("Format", function(args)
             ["end"] = { args.line2, end_line:len() },
           }
         end
-	require("conform").format({ async = true, lsp_format = "fallback", range = range })
+        require("conform").format({ async = true })
       end, { range = true })
 
-return {
+        require("conform").setup(
 {
-		"stevearc/conform.nvim",
-		event = { "BufWritePre" },
-		cmd = { "ConformInfo", "FormatDisable", "FormatEnable" },
-		keys = {
-      -- stylua: ignore
-      { "<leader>fmt", function() require("conform").format({ async = true, lsp_fallback = true }) end, mode = "", desc = "Format buffer", },
-			{ "<leader>fj", ":%!python -m json.tool" },
-		},
-		-- This will provide type hinting with LuaLS
-		---@module "conform"
-		---@type conform.setupOpts
-		opts = {
       log_level = vim.log.levels.DEBUG,
       formatters_by_ft = {
-				rust = { "rustfmt", lsp_format = "fallback" },
+        rust = { "rustfmt" },
         -- Conform will run multiple formatters sequentially
         -- go = { "goimports", "gofmt" },
         -- Use a sub-list to run only the first available formatter
@@ -65,7 +64,7 @@ return {
         -- Conform will run multiple formatters sequentially
         python = { "isort" },
         -- Use a sub-list to run only the first available formatter
-				javascript = { { "prettier" } },
+        javascript = { "prettier" },
         gdscript = { "gdformat" },
         ron = { "ronfmt" },
         dashboard = {},
@@ -84,6 +83,7 @@ return {
           prepend_args = { "-l", "100" },
         },
       },
-		},
+    })
+    end,
   },
 }

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

@@ -38,7 +38,7 @@ return {
 	glug("googlepaths"),
 	-- 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-go", { event = "BufRead,BufNewFile *.go" })),
 	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" })),
@@ -222,7 +222,7 @@ return {
 		},
 		cmd = { "ImpSuggest", "ImpFirst" },
 		keys = {
-      { "<leader>i", ":ImpSuggest <C-r><C-w><cr>" },
+			{ "<leader>I", ":ImpSuggest <C-r><C-w><cr>" },
 		},
 	}),
 	{
@@ -244,10 +244,20 @@ return {
 		url = "sso://googler@user/kdark/ciderlsp-nvim",
 		event = "VimEnter",
 	},
-  -- {
+	{
-  --     name = "nvim_figtree",
+		url = "sso://user/jackcogdill/nvim-figtree",
-  --     url = "sso://googler@user/jackcogdill/nvim-figtree",
+		keys = {
-  -- },
+			{
+				"<Leader>ft",
+				function()
+					require("figtree").toggle()
+				end,
+			},
+		},
+		opts = {
+			-- see |figtree-configuration| for all possible options
+		},
+	},
 	{
 		name = "telescope_codesearch",
 		url = "sso://googler@user/vintharas/telescope-codesearch.nvim",

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

@@ -1,6 +1,16 @@
 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 {
   {
     "kosayoda/nvim-lightbulb",
@@ -69,6 +79,7 @@ return {
 		},
 		keys = {
 			{ "<leader>F", ":lua vim.lsp.buf.format()<CR>" },
+			{ "<leader>i", add_import },
 			{ "<leader>rn", ":lua vim.lsp.buf.rename()<CR>" },
 			{ "L", ":lua vim.lsp.buf.hover()<CR>" },
 			{ "gr", ":Telescope lsp_references<CR>" },
@@ -116,11 +127,14 @@ return {
         lspconfig.ciderlsp.setup({})
       end
 
-			require("lspconfig").gdscript.setup({})
+      lspconfig.gdscript.setup({})
-			vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
+      -- require('lspconfig').gdscript.setup { cmd = { "ncat", "localhost", "6005" }, root_dir = function()
-			vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
+      --   return vim.fs.dirname(vim.fs.find('project.godot', { upward = true })[1])
+      -- end
+      -- }
 
-			require("lspconfig").gdshader_lsp.setup({})
+      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/minuet.lua

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

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

@@ -7,22 +7,27 @@ return {
 	-- },
 	{
 		"nvim-neo-tree/neo-tree.nvim",
+		branch = "v3.x",
+		lazy = false, -- neo-tree will lazily load itself
 		dependencies = {
 			"nvim-lua/plenary.nvim",
+			"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
 			"MunifTanjim/nui.nvim",
-      --			"~/cmdtree",
+			-- {"3rd/image.nvim", opts = {}}, -- Optional image support in preview window: See `# Preview Mode` for more information
 		},
-    cmd = {
+		-----@module "neo-tree"
-      "Neotree",
+		-----@type neotree.Config
-    },
+		opts = {
-    config = function()
-      require("neo-tree").setup({
-        hijack_netrw_behavior = "open_default",
 			filesystem = {
+				hijack_netrw_behavior = "open_default",
 				filtered_items = {
 					hide_dotfiles = false,
 				},
-          bind_to_cwd = false,
+				-- follow_current_file = {
+				-- 	enabled = true,
+				-- 	leave_dirs_open = false,
+				-- },
+				group_empty_dirs = true,
 			},
 			sources = {
 				"filesystem",
@@ -36,17 +41,17 @@ return {
 					["O"] = "expand_all_nodes",
 				},
 			},
-      })
+		},
-    end,
     -- stylua: ignore
     keys = {
       (function()
-        if use_google() then
+        -- if use_google() then
-          return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
+        --   return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
-        end
+        -- end
         return { "<C-n>m", ":Neotree float git_status<CR>", desc = "Open NeoTree CWD float" }
       end)(),
-      { "<C-n>", ":Neotree toggle left dir=%:p:h<cr>" },
+      { "<C-n>", ":Neotree reveal left<cr>" },
+      { "<C-n>.", ":Neotree reveal left dir=%:p:h<cr>" },
     },
 	},
 }

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

@@ -1,52 +1,55 @@
 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':       'chg diff %s',
+  }
-      \ }
+  vim.g.signify_vcs_cmds_diffmode = {
-let g:signify_vcs_cmds_diffmode = {
+    git = "git show " .. git_revision .. ":./%f",
-      \ 'hg':       'chg 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([[:SignifyRefresh]])
 end
 
 _G.signify_normal = function()
-	setup_mercurial("-r .")
+  change_diffbase("-r .", "")
   vim.cmd([[:SignifyEnable]])
   vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_dtp4 = function()
-	setup_mercurial("-r p4head")
+  change_diffbase("-r p4head", "main")
   vim.cmd([[:SignifyEnable]])
   vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_dtex = function()
-	setup_mercurial("-r exported(.)")
+  change_diffbase("-r exported(.)", "origin/main")
   vim.cmd([[:SignifyEnable]])
   vim.cmd([[:SignifyRefresh]])
 end
@@ -62,6 +65,7 @@ return {
     { "<leader>sup", ":lua signify_dtup()<CR>" },
     { "<leader>sex", ":lua signify_dtex()<CR>" },
     { "<leader>sp4", ":lua signify_dtp4()<CR>" },
+    { "<leader>sb",  ":lua signify_dtp4()<CR>" },
   },
   config = function()
     vim.g.signify_vcs_list = { "hg", "git" }

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

@@ -195,6 +195,18 @@ return {
 				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.

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

@@ -6,7 +6,7 @@ return {
 		lazy = false,
 		cond = not use_google(),
 		priority = 1000,
-		dir = "~/neovim-plugins/squk/ableton.nvim",
+		-- dir = "~/neovim-plugins/squk/ableton.nvim",
 		opts = {
 			variant = "cooler",
 		},

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

@@ -32,14 +32,10 @@ return {
           gitsigns = true,
           -- hop = false,
           illuminate = true,
-					-- leap = false,
+          leap = false,
           -- lightspeed = false,
           -- lsp_saga = false,
           lsp_trouble = true,
-					illuminate = {
-						enabled = true,
-						-- lsp = false
-					},
           mason = true,
           markdown = true,
           -- neogit = false,

vim/.vim/lua/utils.lua

@@ -40,48 +40,6 @@ function M.file_exists(name)
   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 = io.open(log_file_path, "a")
@@ -97,4 +55,6 @@ function M.TableConcat(t1, t2)
   return t1
 end
 
+M.flags.blink = not M.use_google()
+
 return M

zsh/.bash_profile

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

zsh/.bash_profile.google

@@ -5,8 +5,11 @@ export ABBR_QUIET=1
 # ---------------
 export PATH=$PATH:/google/src/head/depot/google3/experimental/users/cnieves/util
 export PATH="${HOME}/.config/lsp/lua-language-server/bin:${PATH}"
-export GOROOT=/usr/lib/google-golang
+export PATH=$PATH:/${HOME}/nvim-linux-x86_64/bin/
 export PATH=$GOROOT/bin:$PATH
+
+export DUMMY_API_KEY="DUMMY_API_KEY"
+export GOROOT=/usr/lib/google-golang
 export JAVA_HOME=$(readlink -ne /usr/local/buildtools/java/jdk)
 export CARGO_NET_GIT_FETCH_WITH_CLI=true
 source ~/g3path.zsh
@@ -147,6 +150,7 @@ 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
+alias cclean=/google/src/head/depot/google3/devtools/maintenance/cclean/cclean
 source /google/bin/releases/gmscore-tools/cli/prod/setup_prod_gms.sh
 
 abbr bq="blaze query"

zsh/.zshrc

@@ -37,6 +37,7 @@ zplug "zsh-users/zsh-syntax-highlighting", defer:2
 zplug "mafredri/zsh-async", from:"github", use:"async.zsh"
 zplug "zsh-users/zsh-autosuggestions"
 zplug "zsh-users/zsh-history-substring-search"
+zplug 'joshskidmore/zsh-fzf-history-search'
 zplug "modules/command-not-found", from:prezto
 zplug "romkatv/powerlevel10k", as:theme, depth:1
 
@@ -77,7 +78,7 @@ fi
 
 zle -N fancy-ctrl-z
 bindkey '^Z' fancy-ctrl-z
-bindkey '^R' fzf-history-widget
+# bindkey '^R' fzf-history-widget
 bindkey "^A" beginning-of-line
 bindkey "^E" end-of-line
 bindkey '\eK' kill-line