From f0b4b89b9bab7d493382fd2d4291f2501aee445e Mon Sep 17 00:00:00 2001 From: Christian Nieves Date: Mon, 14 Oct 2024 16:48:07 +0000 Subject: [PATCH] ughghghghghghghg --- config/.config/nvim/lazy-lock.json | 44 ++++++++++++++- config/.config/nvim/spell/en.utf-8.add | 1 + config/.config/nvim/spell/en.utf-8.add.spl | Bin 346 -> 399 bytes vim/.vim/lua/plugin_init.lua | 13 ++++- vim/.vim/lua/plugins/base.lua | 62 +++++++++++---------- vim/.vim/lua/plugins/google.lua | 28 ++-------- vim/.vim/lua/plugins/telescope.lua | 35 +++++++++++- 7 files changed, 129 insertions(+), 54 deletions(-) diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json index 631f865..4f9c441 100644 --- a/config/.config/nvim/lazy-lock.json +++ b/config/.config/nvim/lazy-lock.json @@ -1,3 +1,45 @@ { - "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" } + "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" }, + "ai.nvim": { "branch": "main", "commit": "ab6b6f54612500f48d4d34fcf81529946b9338f3" }, + "buganizer-utils.nvim": { "branch": "main", "commit": "a4af5239a71dd1b6fc2b1b9656f45065865b90e6" }, + "buganizer.nvim": { "branch": "main", "commit": "a5366f694b6cd964edc03259c62790c00b288167" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-nvim-ciderlsp": { "branch": "main", "commit": "4c6c520889f87d68ea6d7c976176499ef8143e1d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "gcert.nvim": { "branch": "main", "commit": "8ce97fc599181cb57657c8da0bde07e215c05ff2" }, + "google-comments": { "branch": "main", "commit": "ad50cd3c71a7553c92a966dba6a03232a81e3812" }, + "googlepaths.nvim": { "branch": "main", "commit": "53439c17178049096809b4fb963e75440b86ad78" }, + "hg.nvim": { "branch": "main", "commit": "12ee0a788309734f1f312060b9f984a97157acf3" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, + "libp.nvim": { "branch": "main", "commit": "636b1748e92f66022c1763f32b2ded6b8606eda5" }, + "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" }, + "lspsaga.nvim": { "branch": "main", "commit": "343b71768c741432bab47d201624e92126a38686" }, + "luasnip-google.nvim": { "branch": "main", "commit": "86df31e12350c15e207fcbc255d951144bb6d0b5" }, + "mini.nvim": { "branch": "main", "commit": "f1dd64cf2ac1b348bd440e59446abf680c7188d6" }, + "mini.trailspace": { "branch": "main", "commit": "f43e2dff55a07e0a84c01ba4b25ed976a12eea44" }, + "neocitc": { "branch": "main", "commit": "3cf22fa7cda398aee6d0c44ef96b56dade7204af" }, + "nvgoog": { "branch": "main", "commit": "d10e84b1e6ac6dc7a58536f844162adf35a272c8" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-figtree": { "branch": "main", "commit": "7e5692fc7d42d0ae87cd37b15fe5a4a70771b3b5" }, + "nvim-lspconfig": { "branch": "master", "commit": "7c4d0f77b8323ff679010706292e5caa4a13d8e6" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, + "nvim-treesitter": { "branch": "master", "commit": "86728435273b63fe71fa64a66c2a6d49e94613a2" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "telescope-citc.nvim": { "branch": "main", "commit": "61df86dc218198a730e27bafd33535dac8539dcf" }, + "telescope-codesearch.nvim": { "branch": "main", "commit": "4c6ad26b1b0a7db6f5de8f0a619a105f93bf63f3" }, + "telescope-fig.nvim": { "branch": "main", "commit": "6ce47b13e7d38584934df5b20f80cbfa825df20a" }, + "telescope-recent-files": { "branch": "main", "commit": "6893cda11625254cc7dc2ea76e0a100c7deeb028" }, + "telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, + "toggleterm.nvim": { "branch": "main", "commit": "fee58a0473fd92b28c34f8f724e4918b15ba30a3" }, + "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, + "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" }, + "vim-imp": { "branch": "main", "commit": "fe9be485854ba602059f0d8af4fa4ab0a74d61ac" }, + "vim-signify": { "branch": "master", "commit": "8670143f9e12ed1cd3c9b2c54f345cdd9a4baac3" }, + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" } } diff --git a/config/.config/nvim/spell/en.utf-8.add b/config/.config/nvim/spell/en.utf-8.add index 16734f1..ec17182 100644 --- a/config/.config/nvim/spell/en.utf-8.add +++ b/config/.config/nvim/spell/en.utf-8.add @@ -8,3 +8,4 @@ collsion_body shake_decay index func/! +lookup_app_pointer_handle/! diff --git a/config/.config/nvim/spell/en.utf-8.add.spl b/config/.config/nvim/spell/en.utf-8.add.spl index f7f86204284af42c16fb00486e464db526c5a5a7..2cb557a0ba79df9223a3613ad82dcf198a5b93e8 100644 GIT binary patch delta 180 zcmcb`)Xyvu=IL8pkeZWY^q+x&;SEP}T1IBhMBzY2--)T}^=>7Md5kHHsf>&a3`!M@ z`9PS>Sjt$y7|)mpBtdimP%IOussyO22*}R>%7FCbfb{r+#4;JnfMO+JGg6sSGk{Ex mhGHNMQko2sa7zWUvw=p$gRKLLDJ1fPZOj2H2bnhUSqT7ny(ifK delta 107 zcmeBYzQrUQ=IL8pkeZWY^q+x&VK;knT1MtXkw8YDiD~Mxt|g3lj46z%jEoEniWQ7S vjG2sOjERgTVE)8=5~{ALKyEfrK|EMlGDt!`kue_#bAXETKzyIc(u^el;*c1p diff --git a/vim/.vim/lua/plugin_init.lua b/vim/.vim/lua/plugin_init.lua index 885d28d..83de0c2 100644 --- a/vim/.vim/lua/plugin_init.lua +++ b/vim/.vim/lua/plugin_init.lua @@ -1,3 +1,4 @@ +local use_google = require("utils").use_google local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then vim.fn.system({ @@ -12,6 +13,16 @@ vim.opt.rtp:prepend(lazypath) package.path = package.path .. ";" .. vim.env.HOME .. "/.vim/lua/?.lua" -require("lazy").setup("plugins") +local plugins = { + -- this entry tells lazy.nvim to load the list of of *.lua files from plugins/ + { import = "plugins" }, +} +if use_google() then + table.insert(plugins, { + url = "sso://user/fentanes/nvgoog", + import = "nvgoog.default", + }) +end +require("lazy").setup(plugins) require("config.clipboard") require("config.zip") diff --git a/vim/.vim/lua/plugins/base.lua b/vim/.vim/lua/plugins/base.lua index 377a782..5ad7484 100644 --- a/vim/.vim/lua/plugins/base.lua +++ b/vim/.vim/lua/plugins/base.lua @@ -11,15 +11,19 @@ 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" }, - { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, - }, + opts = { + jump = { + nohlsearch = true, + }, + }, + -- 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" }, + { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, + }, }, { "MagicDuck/grug-far.nvim", @@ -115,11 +119,11 @@ return { "folke/persistence.nvim", event = "BufReadPre", -- this will only start session saving when an actual file was opened opts = {}, - -- stylua: ignore - keys = { - { "ss", [[lua require("persistence").save()]] }, - { "sl", [[lua require("persistence").load()]] }, - }, + -- stylua: ignore + keys = { + { "ss", [[lua require("persistence").save()]] }, + { "sl", [[lua require("persistence").load()]] }, + }, }, { "rmagatti/auto-session", @@ -143,10 +147,10 @@ return { cmd = { "Subs", }, - -- stylua: ignore - keys = { - { "tc", "TextCaseOpenTelescope", mode = { "n", "v" }, desc = "Telescope" }, - }, + -- stylua: ignore + keys = { + { "tc", "TextCaseOpenTelescope", mode = { "n", "v" }, desc = "Telescope" }, + }, }, { "NvChad/nvim-colorizer.lua", @@ -178,15 +182,15 @@ return { config = function() vim.g.undotree_SetFocusWhenToggle = 1 end, - -- stylua: ignore - keys = { { "ut", ":UndotreeToggle" } }, + -- stylua: ignore + keys = { { "ut", ":UndotreeToggle" } }, }, { "stevearc/aerial.nvim", opts = {}, cmd = { "AerialToggle", "AerialOn" }, - -- stylua: ignore - keys = { { "so", ":AerialToggle", desc = "[S]symbols [O]utline" } }, + -- stylua: ignore + keys = { { "so", ":AerialToggle", desc = "[S]symbols [O]utline" } }, }, { "andrewferrier/debugprint.nvim", @@ -198,12 +202,12 @@ return { -- Remove the following line to use development versions, -- not just the formal releases version = "*", - -- stylua: ignore - keys = { - { "dp", ":lua require('debugprint').debugprint()", desc = "Debug print" }, - { "dP", ":lua require('debugprint').debugprint({above = true})", desc = "Debug print" }, - { "dq", ":lua require('debugprint').debugprint({variable = true})", desc = "Debug print" }, - { "dQ", ":lua require('debugprint').debugprint({variable = true, above = true})", desc = "Debug print", }, - }, + -- stylua: ignore + keys = { + { "dp", ":lua require('debugprint').debugprint()", desc = "Debug print" }, + { "dP", ":lua require('debugprint').debugprint({above = true})", desc = "Debug print" }, + { "dq", ":lua require('debugprint').debugprint({variable = true})", desc = "Debug print" }, + { "dQ", ":lua require('debugprint').debugprint({variable = true, above = true})", desc = "Debug print", }, + }, }, } diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua index a00228e..00b8160 100644 --- a/vim/.vim/lua/plugins/google.lua +++ b/vim/.vim/lua/plugins/google.lua @@ -4,13 +4,12 @@ if not use_google() then return {} end -vim.opt.rtp:append("/google/src/head/depot/google3/experimental/users/fentanes/nvgoog") +vim.opt.rtp:append("/google/src/head/depot/google3/experimental/users/fentanes/nvgoog/") -- local glug = require("nvgoog.google.util.glug").glug -- local glugOpts = require("nvgoog.google.util.glug").glugOpts local glug = require("glug").glug local glugOpts = require("glug").glugOpts -local veryLazy = require("nvgoog.util").veryLazy return { { url = "sso://user/fentanes/nvgoog" }, @@ -42,25 +41,10 @@ return { -- Add support for google filetypes glug("google-filetypes", { event = { "BufReadPre", "BufNewFile" }, dependencies = {} }), - -- Other filetype detection - veryLazy(glug("ft-cel", { event = "BufRead,BufNewFile *.cel,*jvp" })), - veryLazy(glug("ft-clif", { event = "BufRead,BufNewFile *.clif" })), - veryLazy(glug("ft-gin", { event = "BufRead,BufNewFile *.gin" })), - veryLazy(glug("ft-gss", { event = "BufRead,BufNewFile *.gss" })), - veryLazy(glug("ft-proto", { event = "BufRead,BufNewFile *.proto,*.protodevel,*.rosy,*.textproto" })), - veryLazy(glug("ft-soy", { event = "BufRead,BufNewFile *.soy" })), - -- Set up syntax, indent, and core settings for various filetypes - veryLazy(glug("ft-cpp", { event = "BufRead,BufNewFile *.[ch],*.cc,*.cpp" })), - veryLazy(glug("ft-go", { event = "BufRead,BufNewFile *.go" })), - veryLazy(glug("ft-java", { event = "BufRead,BufNewFile *.java" })), - veryLazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })), - veryLazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })), - veryLazy(glug("ft-python", { event = "BufRead,BufNewFile *.py" })), - -- Configures nvim to respect Google's coding style -- glug("googlestyle", { event = { "BufRead", "BufNewFile" } }), - veryLazy(glug("add_usings")), + glug("add_usings"), -- Autogens boilerplate when creating new files glug("autogen", { event = "BufNewFile", @@ -230,7 +214,7 @@ return { end, }), -- Imports - veryLazy(glug("imp-google", { + glug("imp-google", { dependencies = { glugOpts("vim-imp", { "flwyd/vim-imp", @@ -247,7 +231,7 @@ return { keys = { { "i", ":ImpSuggest " }, }, - })), + }), { url = "sso://user/fentanes/googlepaths.nvim", event = { "VeryLazy", "BufReadCmd //*" }, @@ -259,8 +243,7 @@ return { }, { name = "cmp-nvim-ciderlsp", - url = "sso://googler@user/sakal/cmp-nvim-ciderlsp", - -- url = "sso://googler@user/piloto/cmp-nvim-ciderlsp", + url = "sso://googler@user/piloto/cmp-nvim-ciderlsp", event = "VimEnter", dependencies = { "hrsh7th/nvim-cmp", @@ -296,6 +279,7 @@ return { { name = "critique-nvim", dir = "~/critique-nvim/", + cond = false, lazy = false, dependencies = { "rktjmp/time-ago.vim", diff --git a/vim/.vim/lua/plugins/telescope.lua b/vim/.vim/lua/plugins/telescope.lua index e7777aa..e5dceac 100644 --- a/vim/.vim/lua/plugins/telescope.lua +++ b/vim/.vim/lua/plugins/telescope.lua @@ -59,7 +59,6 @@ local keys = { { "tg", ":Telescope git_files", desc = "Git Files" }, { "th", ":lua require('telescope.builtin').help_tags{}", desc = "[T]elescope [H]elp" }, { "tk", ":Telescope keymaps", desc = "Keymaps" }, - { "to", ":Telescope oldfiles", desc = "Recent(oldfiles) Files" }, { "tn", ":Telescope notify", desc = "Notifications" }, { "tr", ":Telescope resume", desc = "Telescope Resume" }, -- @@ -105,6 +104,15 @@ return { { "?", "lua require('actions-preview').code_actions()" }, }, }, + { + "smartpde/telescope-recent-files", + config = function() + require("telescope").load_extension("recent_files") + end, + keys = { + { "to", [[lua require('telescope').extensions.recent_files.pick()]] }, + }, + }, { "piersolenski/telescope-import.nvim", dependencies = "nvim-telescope/telescope.nvim", @@ -123,6 +131,7 @@ return { "nvim-telescope/telescope.nvim", dependencies = { "mfussenegger/nvim-dap", + "smartpde/telescope-recent-files", "rcarriga/nvim-dap-ui", }, config = function() @@ -178,6 +187,30 @@ return { codesearch = { experimental = true, -- enable results from google3/experimental }, + recent_files = { + -- This function rewrites all file paths to the current workspace. + -- For example, if w2 is the current workspace, then + -- /google/.../w1/google3/my_file.cc becomes /google/.../w2/google3/my_file.cc, + transform_file_path = function(path) + local neocitc = require("neocitc") + local path_func = neocitc.path_in_current_workspace_or_head + or neocitc.path_in_current_workspace + return path_func(path) + end, + -- This is a useful option to speed up Telescope by avoiding the check + -- for file existence. + stat_files = false, + -- Ignore common patterns that can show up from other google plugins + ignore_patterns = { + "/%.git/COMMIT_EDITING$", + "/%.git/COMMIT_EDITMSG$", + "/%.git/MERGE_MSG$", + "^/tmp/%.pipertmp-", + "/Related_Files$", + "^term:", + ";#toggleterm#", + }, + }, persisted = {}, import = { -- Add imports to the top of the file keeping the cursor in place