goose

alacritty/.alacritty.toml

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

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

@@ -13,25 +13,18 @@ if not vim.loop.fs_stat(lazypath) then
 end
 vim.opt.rtp:prepend(lazypath)
 vim.opt.rtp:prepend(vim.env.HOME .. "/.vim")
-vim.opt.rtp:prepend(vim.env.HOME .. "/.vim/lua")
+local luahome = vim.env.HOME .. "/.vim/lua"
+vim.opt.rtp:prepend(luahome)
 
 package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua"
 
-require("config.clipboard")
-require("config.tmpl")
-require("config.zip")
+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",
-	-- 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,79 +1,3 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
-  "actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" },
-  "ai.nvim": { "branch": "main", "commit": "f042afc07d2815aa7aef9d1d8bd7e6f4f4957296" },
-  "asyncrun.vim": { "branch": "master", "commit": "78dc9277f2b989553861ee7c35b640112d95e1b5" },
-  "bevy_inspector.nvim": { "branch": "master", "commit": "627d172ce0ef65c52e10cdb0c38bd5b301d90b3c" },
-  "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" },
-  "blink-emoji.nvim": { "branch": "master", "commit": "81e6c080d1e64c9ef548534c51147fd8063481c8" },
-  "blink-ripgrep.nvim": { "branch": "main", "commit": "a17697bba1bd351f6686b9f9285cf2fd1b03cf4a" },
-  "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" },
-  "blink.compat": { "branch": "main", "commit": "5ca8848c8cc32abdc980e5db4f0eb7bb8fbf84dc" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" },
-  "ciderlsp-nvim": { "branch": "main", "commit": "9cd409f51cbb25a9813a15dfa84753fe7f26caac" },
-  "cmp-nerdfont": { "branch": "main", "commit": "e97482344ebed29093015a18c155057adf5c842b" },
-  "cmp-nvim-ciderlsp": { "branch": "main", "commit": "58faf9323bcbb5358d820d3fa7f5d0b4c0608b62" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
-  "conflict-marker.vim": { "branch": "master", "commit": "62742b2ffe7a433988759c67b5c5a22eff74a14b" },
-  "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" },
-  "crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" },
-  "dashboard-nvim": { "branch": "master", "commit": "000448d837f6e7a47f8f342f29526c4d7e49e9ce" },
-  "firenvim": { "branch": "master", "commit": "f8a5fa6f1ed42536490acf0840497c40331c184f" },
-  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "fzf.vim": { "branch": "master", "commit": "556f45e79ae5e3970054fee4c4373472604a1b4e" },
-  "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" },
-  "googlepaths.nvim": { "branch": "main", "commit": "53439c17178049096809b4fb963e75440b86ad78" },
-  "hg": { "branch": "main", "commit": "12ee0a788309734f1f312060b9f984a97157acf3" },
-  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" },
-  "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" },
-  "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" },
-  "lsp_lines.nvim": { "branch": "main", "commit": "3b57922d2d79762e6baedaf9d66d8ba71f822816" },
-  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "luasnip-google.nvim": { "branch": "main", "commit": "86df31e12350c15e207fcbc255d951144bb6d0b5" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" },
-  "mini.notify": { "branch": "main", "commit": "05e598d5b349bd66404d576e6a4d4340aea5f194" },
-  "neo-tree.nvim": { "branch": "main", "commit": "521bb4253b1adc2a1ff6c584bc839eba9bc99c0b" },
-  "neovim-throttle-debounce": { "branch": "main", "commit": "f6bf97fa0dc704affc8149aeaef5ef0cafa4d10c" },
-  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
-  "nvim-dap": { "branch": "master", "commit": "ead0de6eac91a555b714bfd7d28959eeecfb96f9" },
-  "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
-  "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" },
-  "nvim-jdtls": { "branch": "master", "commit": "3efcd0700a293efea9dada58f79c32a64850eb24" },
-  "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" },
-  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
-  "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" },
-  "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" },
-  "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" },
-  "nvim-treesitter": { "branch": "master", "commit": "2206739829518c9ea59dbdb9003e0147fdaf2d1c" },
-  "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "ec1a2431f8872f650a85ed71c24f0715df2e49c2" },
-  "onedark.nvim": { "branch": "main", "commit": "b5161f0c631571640485be5d1c059cab82c86872" },
-  "paint.nvim": { "branch": "main", "commit": "ef6f717a8669619ebbd098fb72f85115d64c6c92" },
-  "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" },
-  "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
-  "rustaceanvim": { "branch": "master", "commit": "aed4dabd7a7ef5b976c2ff5693997563afa9f082" },
-  "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" },
-  "telescope-import.nvim": { "branch": "main", "commit": "6fd69447679a99b463025e7f2f787e8b185dd740" },
-  "telescope-recent-files": { "branch": "main", "commit": "3a7a1b9c6b52b6ff7938c59f64c87a05e013dff8" },
-  "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" },
-  "telescope_citc": { "branch": "main", "commit": "61df86dc218198a730e27bafd33535dac8539dcf" },
-  "telescope_codesearch": { "branch": "main", "commit": "4c6ad26b1b0a7db6f5de8f0a619a105f93bf63f3" },
-  "telescope_fig": { "branch": "main", "commit": "6ce47b13e7d38584934df5b20f80cbfa825df20a" },
-  "time-ago.vim": { "branch": "master", "commit": "be978d5c790cfcc41f524205f28783b9937fd0ee" },
-  "tree-sitter-gdscript": { "branch": "master", "commit": "48b49330888a4669b48619b211cc8da573827725" },
-  "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" },
-  "vim-bazel": { "branch": "master", "commit": "31b0d5e4f51da1aeb56d65bf505a744e6de405de" },
-  "vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" },
-  "vim-imp": { "branch": "main", "commit": "87d5725e065a76d89aa52889ee8804e723d16e14" },
-  "vim-maktaba": { "branch": "master", "commit": "fe95bb10f6bb250943a44632107f6a3d76ce5f28" },
-  "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": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" },
-  "vim-tmux-syntax": { "branch": "master", "commit": "1b6a6a5beb96fa232c8d35d305f77496b12678a9" },
-  "vimux": { "branch": "master", "commit": "7db6b2f79d432ee3820668b1d4625311dbe1d0ad" },
-  "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" },
-  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
+  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }
 }

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

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

config/.ripgreprc

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

git/.gitconfig

@@ -42,10 +42,61 @@
     tool = "nvim"
 [mergetool "nvim"]
     cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
-[diff]
-	tool = icdiff
 [filter "lfs"]
     clean = git-lfs clean -- %f
     smudge = git-lfs smudge -- %f
     process = git-lfs filter-process
     required = true
+
+
+# clearly makes git better
+
+[column]
+    ui = auto
+[branch]
+    sort = -committerdate
+[tag]
+    sort = version:refname
+[init]
+    defaultBranch = main
+[diff]
+    algorithm = histogram
+    colorMoved = plain
+    mnemonicPrefix = true
+    renames = true
+	tool = icdiff
+[push]
+    default = simple
+    autoSetupRemote = true
+    followTags = true
+[fetch]
+    prune = true
+    pruneTags = true
+    all = true
+
+# why the hell not?
+
+[help]
+    autocorrect = prompt
+[commit]
+    verbose = true
+[rerere]
+    enabled = true
+    autoupdate = true
+[core]
+    excludesfile = ~/.gitignore
+[rebase]
+    autoSquash = true
+    autoStash = true
+    updateRefs = true
+
+# a matter of taste (uncomment if you dare)
+
+[core]
+    # fsmonitor = true
+    # untrackedCache = true
+[merge]
+    # (just 'diff3' if git version < 2.3)
+    # conflictstyle = zdiff3
+[pull]
+    # rebase = true

google/.hgrc

@@ -16,15 +16,15 @@ opts.vimdiff = -d
 # opts.vimdiff = -c ':call ShowMercurialDiff(argv(0), argv(1))'
 
 [extensions]
-unsupported.tree =
-unsupported.alices =
+# unsupported.tree =
+# unsupported.alices =
 extdiff =
-color =
+# color =
 beautifygraph =
 
-[alices]
-findings.extra_args = --proxy
-summarize.extra_args = --proxy
+# [alices]
+# findings.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

@@ -124,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"
@@ -133,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'
@@ -170,6 +167,7 @@ set -g @plugin 'catppuccin/tmux'
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
+set -g @plugin 'catppuccin/tmux#v2.1.2'
 
 set -g @continuum-restore 'on'
 set -g @resurrect-dir '$HOME/.tmux/resurrect'

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

@@ -1,6 +1,20 @@
 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 = "wayland",
+		copy = {
+			["+"] = { "wl-copy" },
+			["*"] = { "wl-copy" },
+		},
+		paste = {
+			["+"] = { "wl-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 = {
@@ -13,6 +27,7 @@ if vim.env.SSH_TTY or vim.env.SSH_CLIENT or vim.env.SSH_CONNECTION then
 		  },
 		  cache_enabled = false,
 	  }
+  end
 end
 
 map("v", "<leader>y", '"+y')

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

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

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

@@ -0,0 +1,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,8 +1,24 @@
 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" } },
+  {
     "MagicDuck/grug-far.nvim",
     config = function()
       require("grug-far").setup({
@@ -84,10 +100,6 @@ return {
     cmd = {
       "Subs",
     },
-    -- stylua: ignore
-    keys = {
-      { "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
-    },
   },
   {
     "NvChad/nvim-colorizer.lua",

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",
-      "filetype",
+      -- "vimopts",
+      -- "filetype",
     },
   }
 }

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

@@ -1,5 +1,18 @@
 local use_google = require("utils").use_google
 local flags = require("utils").flags
+local kind_icons = {
+	-- LLM Provider icons
+	claude = "󰋦",
+	openai = "󱢆",
+	codestral = "󱎥",
+	gemini = "",
+	nvim_ciderlsp = "󱜚",
+	Groq = "",
+	Openrouter = "󱂇",
+	Ollama = "󰳆",
+	["Llama.cpp"] = "󰳆",
+	Deepseek = "",
+}
 
 return {
 	{
@@ -20,7 +33,6 @@ return {
 		lazy = false, -- lazy loading handled internally
 		cond = flags.blink,
 		dependencies = {
-      "Exafunction/codeium.nvim",
 			"chrisgrieser/cmp-nerdfont",
 			"hrsh7th/cmp-nvim-lsp",
 			"mikavilpas/blink-ripgrep.nvim",
@@ -49,6 +61,11 @@ return {
 
         ["<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)
@@ -60,16 +77,18 @@ 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, "codeium")
+						-- table.insert(providerToEnable, "avante")
+						table.insert(providerToEnable, "minuet")
 					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
@@ -86,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 = {
@@ -106,12 +126,20 @@ return {
 					nerdfont = {
 						name = "nerdfont",
 						module = "blink.compat.source",
+						score_offset = 1, -- the higher the number, the higher the priority
 					},
-          codeium = {
-            name = "codeium",
-            module = "blink.compat.source",
-            score_offset = 100,
+					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",
@@ -126,6 +154,8 @@ return {
 			-- experimental signature help support
 			signature = { enabled = true },
 			completion = {
+				-- Recommended to avoid unnecessary request
+				trigger = { prefetch_on_insert = false },
 				list = {
           -- stylua: ignore
           selection = {

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

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

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

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

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

@@ -1,46 +1,5 @@
 local use_google = require("utils").use_google
 
-vim.g.disable_autoformat = false
-vim.api.nvim_create_user_command("FormatDisable", function(args)
-	if args.bang then
-		-- FormatDisable! will disable formatting just for this buffer
-		vim.b.disable_autoformat = true
-	else
-		vim.g.disable_autoformat = true
-	end
-end, {
-	desc = "Disable autoformat-on-save",
-	bang = true,
-})
-vim.api.nvim_create_user_command("FormatEnable", function()
-	vim.b.disable_autoformat = false
-	vim.g.disable_autoformat = false
-end, {
-	desc = "Re-enable autoformat-on-save",
-})
-
-vim.api.nvim_create_autocmd("BufWritePre", {
-	pattern = "*",
-	callback = function(args)
-		if vim.g.disable_autoformat or vim.b[args.buf].disable_autoformat then
-			return
-		end
-		require("conform").format({ bufnr = args.buf })
-	end,
-})
-
-vim.api.nvim_create_user_command("Format", function(args)
-	local range = nil
-	if args.count ~= -1 then
-		local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
-		range = {
-			start = { args.line1, 0 },
-			["end"] = { args.line2, end_line:len() },
-		}
-	end
-	require("conform").format({ async = true, lsp_format = "fallback", range = range })
-end, { range = true })
-
 return {
   {
     "stevearc/conform.nvim",
@@ -51,22 +10,61 @@ return {
       { "<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 = {
+    config = function()
+      vim.g.disable_autoformat = false
+      vim.api.nvim_create_user_command("FormatDisable", function(args)
+        if args.bang then
+          -- FormatDisable! will disable formatting just for this buffer
+          vim.b.disable_autoformat = true
+        else
+          vim.g.disable_autoformat = true
+        end
+      end, {
+        desc = "Disable autoformat-on-save",
+        bang = true,
+      })
+      vim.api.nvim_create_user_command("FormatEnable", function()
+        vim.b.disable_autoformat = false
+        vim.g.disable_autoformat = false
+      end, {
+        desc = "Re-enable autoformat-on-save",
+      })
+
+      vim.api.nvim_create_autocmd("BufWritePre", {
+        pattern = "*",
+        callback = function(args)
+          if vim.g.disable_autoformat or vim.b[args.buf].disable_autoformat then
+            return
+          end
+          require("conform").format({ bufnr = args.buf })
+        end,
+      })
+
+      vim.api.nvim_create_user_command("Format", function(args)
+        local range = nil
+        if args.count ~= -1 then
+          local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
+          range = {
+            start = { args.line1, 0 },
+            ["end"] = { args.line2, end_line:len() },
+          }
+        end
+        require("conform").format({ async = true })
+      end, { range = true })
+
+        require("conform").setup(
+{
       log_level = vim.log.levels.DEBUG,
       formatters_by_ft = {
-				rust = { "rustfmt", 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
-				-- javascript = { { "prettierd", "prettier" } },
         lua = { "stylua" },
         -- Conform will run multiple formatters sequentially
-				python = { "isort", "black" },
+        python = { "isort" },
         -- Use a sub-list to run only the first available formatter
-				javascript = { { "prettierd", "prettier" } },
+        javascript = { "prettier" },
         gdscript = { "gdformat" },
         ron = { "ronfmt" },
         dashboard = {},
@@ -85,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://googler@user/jackcogdill/nvim-figtree",
-  -- },
+	{
+		url = "sso://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,18 +1,17 @@
 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",
-	-- 	event = "VeryLazy",
-	-- 	opts = {
-	-- 		floating_window = true,
-	-- 		hint_prefix = "󰡱 ",
-	-- 	},
-	-- 	config = function(_, opts)
-	-- 		require("lsp_signature").setup(opts)
-	-- 	end,
-	-- },
   {
     "kosayoda/nvim-lightbulb",
     commit = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49",
@@ -80,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>" },
@@ -94,20 +94,7 @@ return {
 			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
 		},
 		config = function()
-			local lsp_status = require("lsp-status")
-			lsp_status.register_progress()
-
-			local capabilities = flags.blink
-					and require("blink.cmp").get_lsp_capabilities(vim.lsp.protocol.make_client_capabilities())
-				or require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
-			capabilities = vim.tbl_extend("keep", capabilities or {}, lsp_status.capabilities)
-			capabilities.offsetEncoding = { "utf-16" }
-
 			local lspconfig = require("lspconfig")
-			local configs = require("lspconfig.configs")
-
-<<<<<<< HEAD
-			local nvim_lspconfig = require("lspconfig")
 			local lsp_configs = require("lspconfig.configs")
 
       lsp_configs.ciderlsp = {
@@ -131,55 +118,23 @@ return {
             "typescript",
           },
           offset_encoding = "utf-8",
-					root_dir = nvim_lspconfig.util.root_pattern(".citc"),
+          root_dir = lspconfig.util.root_pattern(".citc"),
           settings = {},
         },
       }
 
-			nvim_lspconfig.ciderlsp.setup({})
-			-- Godot
-			lspconfig.gdscript.setup({
-				-- flags = {
-				-- 	debounce_text_changes = 2000, -- Wait 5 seconds before sending didChange
-				-- },
-			})
-			vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
-			vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
-		end,
-	},
-=======
       if use_google() then
-        local on_attach = function(client, bufnr)
-          -- local ft = vim.bo[bufnr].filetype
-          -- if ft == "cpp" or ft == "c" then
-          --   if client.server_capabilities.semanticTokensProvider ~= nil then
-          --     client.server_capabilities.semanticTokensProvider = nil
-          --   end
-          -- end
+        lspconfig.ciderlsp.setup({})
       end
 
-        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 = lspconfig.util.root_pattern('.citc'),
-            settings = {},
-          }
-        }
+      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
+      -- }
 
-        lspconfig.ciderlsp.setup { on_attach = on_attach }
-      end
-
-      -- Godot
-      lspconfig.gdscript.setup({
-        -- flags = {
-        -- 	debounce_text_changes = 2000, -- Wait 5 seconds before sending didChange
-        -- },
-      })
       vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
-      vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
+      vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4 wrap]])
     end,
   },
->>>>>>> 0c7bebc (stuff)
 }

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 = {
-      "Neotree",
-    },
-    config = function()
-      require("neo-tree").setup({
-        hijack_netrw_behavior = "open_default",
+		-----@module "neo-tree"
+		-----@type neotree.Config
+		opts = {
 			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
-          return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
-        end
+        -- if use_google() then
+        --   return { "<C-n>m", ":Neotree float cmdtree<CR>", desc = "Open NeoTree CWD float" }
+        -- 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/refactoring.lua

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

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

@@ -6,6 +6,16 @@ return {
 		ft = { "rust" },
 		config = function(_, opts)
 			vim.g.rustaceanvim = vim.tbl_deep_extend("keep", vim.g.rustaceanvim or {}, opts or {})
+
+			for _, method in ipairs({ "textDocument/diagnostic", "workspace/diagnostic" }) do
+				local default_diagnostic_handler = vim.lsp.handlers[method]
+				vim.lsp.handlers[method] = function(err, result, context, config)
+					if err ~= nil and err.code == -32802 then
+						return
+					end
+					return default_diagnostic_handler(err, result, context, config)
+				end
+			end
 		end,
 		opts = {
 			server = {

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

@@ -1,52 +1,55 @@
 local use_google = require("utils").use_google
 
-local function setup_mercurial(hg_revision)
-  local git_cmd = "git diff --no-color --no-ext-diff -U0 -- %f"
-  local rcs_cmd = "rcsdiff -U0 %f 2>%n"
-  local svn_cmd = "svn diff --diff-cmd %d -x -U0 -- %f"
-  local hg_diff = hg_revision .. " --color=never config aliases.diff= --nodates -U0 -- %f"
-  local hg_cat = hg_revision .. " -- %f"
-
-  vim.cmd(string.format(
-    [[
-let g:signify_vcs_cmds = {
-      \ 'git':      '%s',
-      \ 'rcs':      '%s',
-      \ 'svn':      '%s',
-      \ 'hg':       'chg diff %s',
-      \ }
-let g:signify_vcs_cmds_diffmode = {
-      \ 'hg':       'chg cat %s',
-      \ }
-  ]],
-    git_cmd,
-    rcs_cmd,
-    svn_cmd,
-    hg_diff,
-    hg_cat
-  ))
+local function change_diffbase(hg_revision, git_revision)
+  vim.g.signify_vcs_cmds = {
+    git = "git diff --no-color --diff-algorithm=histogram --no-ext-diff -U0 " .. git_revision .. " -- %f",
+    yadm = 'yadm diff --no-color --no-ext-diff -U0 -- %f',
+    hg = 'chg --config alias.diff=diff diff '.. hg_revision .. ' --color=never --nodates -U0 -- %f',
+    svn = 'svn diff --diff-cmd %d -x -U0 -- %f',
+    bzr = 'bzr diff --using %d --diff-options=-U0 -- %f',
+    darcs = 'darcs diff --no-pause-for-gui --no-unified --diff-opts=-U0 -- %f',
+    fossil = 'fossil diff --unified -c 0 -- %f',
+    cvs = 'cvs diff -U0 -- %f',
+    rcs = 'rcsdiff -U0 %f 2>%n',
+    accurev = 'accurev diff %f -- -U0',
+    tfs = 'tf diff -version=W -noprompt -format=Unified %f'
+  }
+  vim.g.signify_vcs_cmds_diffmode = {
+    git = "git show " .. git_revision .. ":./%f",
+    hg = "chg cat " .. hg_revision .. " -- %f",
+    yadm = 'yadm show HEAD:./%f',
+    svn = 'svn cat %f',
+    bzr = 'bzr cat %f',
+    darcs = 'darcs show contents -- %f',
+    fossil = 'fossil cat %f',
+    cvs = 'cvs up -p -- %f 2>%n',
+    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,11 +65,13 @@ 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.g.signify_disable_by_default = 0
     -- vim.g.signify_number_highlight = 1
+    vim.g.signify_sign_show_count = 0
     local s = "▕"
     vim.g.signify_sign_add = s
     vim.g.signify_sign_delete = s
@@ -74,9 +79,10 @@ return {
     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 })
+    local myred = "#f296a0"
+    vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = myred })
+    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

@@ -14,16 +14,6 @@ _G.search_cwd = function()
 	builtin.find_files({ cwd = utils.buffer_dir() })
 end
 
-_G.live_grep = function(search_dirs)
-  require("telescope.builtin").live_grep({
-    search_dirs = search_dirs,
-  })
-end
-
-_G.live_grep_cword = function(search_dirs)
-  require("telescope.builtin").live_grep({ search_dirs = search_dirs })
-end
-
 local function exe(cmd)
 	return vim.split(vim.fn.system(cmd), "\n")
 end
@@ -39,9 +29,9 @@ end
 -- stylua: ignore
 local keys = {
   { "<leader>e",  ":lua search_cwd()<CR>",                                                                    desc = "Find Files in Buffer Directory" },
-  { "<leader>ts", require('telescope.builtin').live_grep },
   { "<leader>tb", ":Telescope buffers<CR>" },
-  { "<leader>TS", function() require('telescope.builtin').live_grep { default_text = vim.fn.expand("<cword>") } end, },
+  -- { "<leader>ts", require('telescope.builtin').live_grep },
+  -- { "<leader>TS", function() require('telescope.builtin').live_grep { default_text = vim.fn.expand("<cword>") } end, },
   {
     "<leader>t.",
     function()
@@ -123,9 +113,32 @@ return {
 			end
 		end,
 	},
+	{
+		"nvim-telescope/telescope-live-grep-args.nvim",
+		keys = {
+			{
+				"<leader>ts",
+				function()
+					require("telescope").extensions.live_grep_args.live_grep_args()
+				end,
+			},
+			{
+				"<leader>TS",
+				function()
+					require("telescope").extensions.live_grep_args.live_grep_args({
+						default_text = vim.fn.expand("<cword>"),
+					})
+				end,
+			},
+		},
+		config = function()
+			require("telescope").load_extension("live_grep_args")
+		end,
+	},
 	{
 		"nvim-telescope/telescope.nvim",
 		dependencies = {
+			"nvim-telescope/telescope-live-grep-args.nvim",
 			"mfussenegger/nvim-dap",
 			"smartpde/telescope-recent-files",
 			"rcarriga/nvim-dap-ui",
@@ -182,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

@@ -1,6 +1,19 @@
 local use_google = require("utils").use_google
 
 return {
+	{
+		"squk/ableton.nvim",
+		lazy = false,
+		cond = not use_google(),
+		priority = 1000,
+		-- dir = "~/neovim-plugins/squk/ableton.nvim",
+		opts = {
+			variant = "cooler",
+		},
+		config = function()
+			vim.cmd("colorscheme ableton")
+		end,
+	},
 	{
 		"dgox16/oldworld.nvim",
 		lazy = false,
@@ -10,7 +23,7 @@ return {
 			variant = "cooler",
 		},
 		config = function()
-			vim.cmd("colorscheme oldworld")
+			-- vim.cmd("colorscheme oldworld")
 		end,
 	},
 	{

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

@@ -25,7 +25,7 @@ end
 
 function M.use_google()
   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
   return M.use_google_cache
 end
@@ -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/.aliases.sh

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

zsh/.bash_profile

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

zsh/.bash_profile.google

@@ -5,8 +5,11 @@ export ABBR_QUIET=1
 # ---------------
 export PATH=$PATH:/google/src/head/depot/google3/experimental/users/cnieves/util
 export PATH="${HOME}/.config/lsp/lua-language-server/bin:${PATH}"
-export GOROOT=/usr/lib/google-golang
+export PATH=$PATH:/${HOME}/nvim-linux-x86_64/bin/
 export PATH=$GOROOT/bin:$PATH
+
+export DUMMY_API_KEY="DUMMY_API_KEY"
+export GOROOT=/usr/lib/google-golang
 export JAVA_HOME=$(readlink -ne /usr/local/buildtools/java/jdk)
 export CARGO_NET_GIT_FETCH_WITH_CLI=true
 source ~/g3path.zsh
@@ -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/.p10k.zsh

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

zsh/.zshrc

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