christian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ughghghghghghghg

Browse Source
This commit is contained in:
Christian Nieves
2024-10-14 16:48:07 +00:00
parent 7744a799f0
commit f0b4b89b9b
7 changed files with 129 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vim/.vim/lua/plugin_init.lua
View File

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

62
vim/.vim/lua/plugins/base.lua
View File

@ -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" },
{ "<c-s>", 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" },
{ "<c-s>", 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 = {
{ "<leader>ss", [[<cmd>lua require("persistence").save()<cr>]] },
{ "<leader>sl", [[<cmd>lua require("persistence").load()<cr>]] },
},
-- stylua: ignore
keys = {
{ "<leader>ss", [[<cmd>lua require("persistence").save()<cr>]] },
{ "<leader>sl", [[<cmd>lua require("persistence").load()<cr>]] },
},
},
{
"rmagatti/auto-session",
@ -143,10 +147,10 @@ return {
cmd = {
"Subs",
},
-- stylua: ignore
keys = {
{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", mode = { "n", "v" }, desc = "Telescope" },
},
-- stylua: ignore
keys = {
{ "<leader>tc", "<cmd>TextCaseOpenTelescope<CR>", 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 = { { "<leader>ut", ":UndotreeToggle<CR>" } },
-- stylua: ignore
keys = { { "<leader>ut", ":UndotreeToggle<CR>" } },
},
{
"stevearc/aerial.nvim",
opts = {},
cmd = { "AerialToggle", "AerialOn" },
-- stylua: ignore
keys = { { "<leader>so", ":AerialToggle<CR>", desc = "[S]symbols [O]utline" } },
-- stylua: ignore
keys = { { "<leader>so", ":AerialToggle<CR>", 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 = {
{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
{ "<leader>dP", ":lua require('debugprint').debugprint({above = true})<cr>", desc = "Debug print" },
{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
},
-- stylua: ignore
keys = {
{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
{ "<leader>dP", ":lua require('debugprint').debugprint({above = true})<cr>", desc = "Debug print" },
{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
{ "<leader>dQ", ":lua require('debugprint').debugprint({variable = true, above = true})<cr>", desc = "Debug print", },
},
},
}

28
vim/.vim/lua/plugins/google.lua
View File

@ -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 = {
{ "<leader>i", ":ImpSuggest <C-r><C-w><cr>" },
},
})),
}),
{
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",

35
vim/.vim/lua/plugins/telescope.lua
View File

@ -59,7 +59,6 @@ local keys = {
{ "<leader>tg", ":Telescope git_files<CR>", desc = "Git Files" },
{ "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
{ "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
{ "<leader>to", ":Telescope oldfiles<CR>", desc = "Recent(oldfiles) Files" },
{ "<leader>tn", ":Telescope notify<CR>", desc = "Notifications" },
{ "<leader>tr", ":Telescope resume<CR>", desc = "Telescope Resume" },
--
@ -105,6 +104,15 @@ return {
{ "?", "<cmd>lua require('actions-preview').code_actions()<cr>" },
},
},
{
"smartpde/telescope-recent-files",
config = function()
require("telescope").load_extension("recent_files")
end,
keys = {
{ "<leader>to", [[<cmd>lua require('telescope').extensions.recent_files.pick()<CR>]] },
},
},
{
"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