fix conform

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"
+black = '#353539'
-blue = "#74b2ff"
+blue = '#a7b3dd'
-cyan = "#85dc85"
+cyan = '#6de6fc'
-green = "#36c692"
+green = '#a8fc8d'
-magenta = "#ae81ff"
+magenta = '#eb4cce'
-red = "#ff5189"
+red = '#ca72de'
-white = "#e4e4e4"
+white = '#c9c7cd'
-yellow = "#c6c684"
+yellow = '#f7f48d'
 
 [colors.cursor]
 cursor = "#8e8e8e"
 text = "#080808"
 
-[colors.normal]
-black = "#323437"
-blue = "#80a0ff"
-cyan = "#79dac8"
-green = "#8cc85f"
-magenta = "#cf87e8"
-red = "#ff5454"
-white = "#c6c6c6"
-yellow = "#e3c78a"
-
-[colors.primary]
-background = "#080808"
-bright_foreground = "#eeeeee"
-foreground = "#bdbdbd"
-
 [colors.selection]
 background = "#b2ceee"
 text = "#080808"

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

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

config/.config/nvim/init.lua

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

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

google/.hgrc

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

tmux/.tmux.conf

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

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

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

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

@@ -1,5 +1,18 @@
 local use_google = require("utils").use_google
 local flags = require("utils").flags
+local kind_icons = {
+	-- LLM Provider icons
+	claude = "󰋦",
+	openai = "󱢆",
+	codestral = "󱎥",
+	gemini = "",
+	nvim_ciderlsp = "󱜚",
+	Groq = "",
+	Openrouter = "󱂇",
+	Ollama = "󰳆",
+	["Llama.cpp"] = "󰳆",
+	Deepseek = "",
+}
 
 return {
 	{
@@ -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 = {
+					minuet = {
-            name = "codeium",
+						name = "minuet",
-            module = "blink.compat.source",
+						module = "minuet.blink",
-            score_offset = 100,
+						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,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,35 +49,22 @@ 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
-				-- 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

@@ -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>" },
     },
   }),
   {

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,7 +94,7 @@ return {
 			{ "<C-g>", ":lua vim.lsp.buf.signature_help()<CR>", mode = "i" },
 		},
 		config = function()
-			local nvim_lspconfig = require("lspconfig")
+			local lspconfig = require("lspconfig")
 			local lsp_configs = require("lspconfig.configs")
 
       lsp_configs.ciderlsp = {
@@ -118,18 +118,23 @@ return {
             "typescript",
           },
           offset_encoding = "utf-8",
-					root_dir = nvim_lspconfig.util.root_pattern(".citc"),
+          root_dir = lspconfig.util.root_pattern(".citc"),
           settings = {},
         },
       }
 
       if use_google() then
-				nvim_lspconfig.ciderlsp.setup({})
+        lspconfig.ciderlsp.setup({})
       end
-			nvim_lspconfig.wgsl_analyzer.setup({})
+
+      lspconfig.gdscript.setup({})
+      -- require('lspconfig').gdscript.setup { cmd = { "ncat", "localhost", "6005" }, root_dir = function()
+      --   return vim.fs.dirname(vim.fs.find('project.godot', { upward = true })[1])
+      -- end
+      -- }
 
       vim.cmd([[autocmd FileType gdscript setlocal commentstring=#\ %s]])
-			vim.cmd([[autocmd FileType gdscript setlocal autoindent noexpandtab tabstop=4 shiftwidth=4]])
+      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/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 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

@@ -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

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,15 +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"