Load Google plugins with lazy.nvim

This commit is contained in:
Christian Nieves
2023-06-09 15:12:48 -05:00
parent 2da88c8523
commit 9e6d2a6726
9 changed files with 143 additions and 169 deletions

View File

@ -1 +0,0 @@

View File

@ -0,0 +1,11 @@
vim.cmd([[
Glaive imp Suggest[default]=buffer,csearch,prompt Pick[default]=fzf
]])
-- To search for imports in the file's parent directory before using Code Search across all of google3, install ripgrep and try
vim.cmd([[
Glaive imp Suggest[gcl]=buffer,ripgrep,csearch,prompt
\ Location[gcl]=parent Location[borg]=parent
\ Suggest[borg]=buffer,ripgrep,csearch,prompt
\ Suggest[aidl]=buffer,ripgrep,csearch,prompt
]])

View File

@ -1,26 +0,0 @@
local map = require("utils").map
local use_google = require("utils").use_google
map("n", "<leader>csi", ":ImpSuggest <C-r><C-w><cr>")
map("n", "<leader>ii", ":ImpSuggest <C-r><C-w><cr>")
map("n", "<leader>if", ":ImpSuggest <C-r><C-w><cr>")
if use_google() then
vim.cmd([[Glug! glaive]])
-- vim.cmd([[Glaive imp Pick[default]=fzf Suggest[default]=buffer,primp,csearch,prompt Report[default]=echo]])
vim.cmd([[
set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/vim-imp
set runtimepath+=/google/src/files/head/depot/google3/experimental/users/tstone/vim/imp-csearch
Glug imp-google
Glaive imp Suggest[default]=buffer,csearch,prompt Pick[default]=fzf
]])
-- To search for imports in the file's parent directory before using Code Search across all of google3, install ripgrep and try
vim.cmd([[
Glaive imp Suggest[gcl]=buffer,ripgrep,csearch,prompt
\ Location[gcl]=parent Location[borg]=parent
\ Suggest[borg]=buffer,ripgrep,csearch,prompt
\ Suggest[aidl]=buffer,ripgrep,csearch,prompt
]])
end

View File

@ -22,9 +22,3 @@ vim.g.NERDTrimTrailingWhitespace = 1
--Enable NERDCommenterToggle to check all selected lines is commented or not
vim.g.NERDToggleCheckAllLines = 1
nnoremap <leader>c<Space> :call nerdcommenter#Comment(0,"toggle")<CR>
vnoremap <leader>c<Space> :call nerdcommenter#Comment(0,"toggle")<CR>
nnoremap <leader>c$ :call nerdcommenter#Comment(0,"ToEOL")<CR>
vnoremap <leader>c$ :call nerdcommenter#Comment(0,"ToEOL")<CR>

View File

@ -23,15 +23,19 @@ return
'nvim-lua/plenary.nvim',
{
'scrooloose/nerdcommenter',
config = function()
'preservim/nerdcommenter',
init = function()
require("config.nerdcommenter")
end,
keys = {
{ "<leader>c<Space>", ":call nerdcommenter#Comment(0, 'toggle')<CR>" },
{ "<leader>c<Space>", ":call nerdcommenter#Comment(0, 'toggle')<CR>", 'v' },
{ "<leader>c<Space>", ":call nerdcommenter#Comment(0, 'toggle')<CR>", mode='v' },
{ "<leader>cS", ":call nerdcommenter#Comment(0, 'sexy')<CR>" },
{ "<leader>cS", ":call nerdcommenter#Comment(0, 'sexy')<CR>", mode='v' },
{ "<leader>c$", ":call nerdcommenter#Comment(0, 'ToEOL')<CR>" },
{ "<leader>c$", ":call nerdcommenter#Comment(0, 'ToEOL')<CR>", 'v' },
{ "<leader>c$", ":call nerdcommenter#Comment(0, 'ToEOL')<CR>", mode='v' },
}
},
{
@ -150,7 +154,7 @@ return
{ '<C-P>', [[:lua require('telescope').extensions.codesearch.find_files{}<CR>]],'n', { noremap = true, silent=true }},
{ '<C-Space>', [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]], { noremap = true, silent = true }},
{ '<leader>cs', [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]], { noremap = true, silent = true }},
{ '<leader>cs', [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]], 'v', { noremap = true, silent = true }},
{ '<leader>cs', [[:lua require('telescope').extensions.codesearch.find_query{}<CR>]], mode='v', { noremap = true, silent = true }},
{ '<leader>CS', [[:lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]], { noremap = true, silent = true } },
},
},
@ -286,7 +290,7 @@ return
{
"iamcco/markdown-preview.nvim",
build = "cd app && npm install",
setup = function()
init = function()
vim.g.mkdp_filetypes = { "markdown" }
end,
ft = { "markdown" }

View File

@ -1,90 +1,118 @@
local use_google = require("utils").use_google
return {
{
name = "ai.nvim",
url = 'sso://googler@user/vvvv/ai.nvim',
},
{
name = "cmp_nvim_ciderlsp",
url = 'sso://googler@user/piloto/cmp-nvim-ciderlsp',
lazy = false;
dependencies = {
'hrsh7th/nvim-cmp',
}
},
{
name = "ciderlsp_nvim",
url = 'sso://googler@user/kdark/ciderlsp-nvim',
lazy = false;
dependencies = {
'hrsh7th/nvim-cmp',
}
},
{
name = "nvim_figtree",
url = "sso://googler@user/jackcogdill/nvim-figtree",
},
{
name = "telescope_codesearch",
url = 'sso://googler@user/vintharas/telescope-codesearch.nvim',
dependencies = { 'nvim-telescope/telescope.nvim' },
},
{
name = "telescope_citc",
url = 'sso://googler@user/aktau/telescope-citc.nvim',
dependencies = { 'nvim-telescope/telescope.nvim' }
},
{
name = "telescope_fig",
url = 'sso://googler@user/tylersaunders/telescope-fig.nvim',
dependencies = { 'nvim-telescope/telescope.nvim' }
},
{
name = "google_comments",
url = 'sso://googler@user/chmnchiang/google-comments',
-- '/google/src/head/depot/google3/experimental/users/chmnchiang/neovim/google-comments',
-- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments',
dependencies = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
config = function()
require("config.google-comments")
end,
},
-- {
-- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
-- config = [[ require("critique").setup() ]]
-- },
{
name = "hg",
url = "sso://googler@user/smwang/hg.nvim",
dependencies = { "ipod825/libp.nvim" },
config = function()
require("config.fig")
require("hg").setup()
end,
local function goog(plugin, config)
return {
name = plugin,
dir = "/usr/share/vim/google/" .. plugin,
dependencies = { "maktaba" },
config = config,
}
}
-- {
-- 'google/vim-glaive',
-- after = {
-- 'google/vim-maktaba',
-- }
-- -- disable = use_google(),
-- -- cond = not use_google(),
-- }
-- {
-- 'google/vim-maktaba',
-- -- disable = use_google(),
-- -- cond = not use_google(),
-- }
-- {
-- 'flwyd/vim-imp',
-- disable = use_google(),
-- -- cond = not use_google(),
-- after = {
-- 'google/vim-maktaba',
-- 'google/vim-glaive',
-- }
-- }
end
if use_google() then
return {
{
name = "maktaba",
dir = "/usr/share/vim/google/maktaba",
init = function ()
vim.cmd("source /usr/share/vim/google/glug/bootstrap.vim")
end,
},
goog("core"),
goog("glaive"),
goog("alert"),
goog("csearch"),
goog("codefmt"),
goog("codefmt-google"),
goog("languages"),
goog("googlestyle"),
goog("googlespell"),
goog("googlepaths"),
goog("google-filetypes"),
goog("ft-java"),
goog("ft-kotlin"),
goog("ft-proto"),
goog("critique"),
goog("piper"),
goog("gtimporter"),
goog("blaze"),
goog("buganizer"),
goog("relatedfiles"),
goog("g4"),
goog("outline-window"),
goog("fzf-query"),
{
name = "imp-google",
dir = "/usr/share/vim/google/imp-google",
dependencies = { "maktaba", "vim-imp", "glaive" },
config = function()
require("config.imp-google")
end,
},
{
"flwyd/vim-imp",
dependencies = {"imp-google"},
keys = {
{ "<leader>ii", ":ImpSuggest <C-r><C-w><cr>" },
}
},
{
name = "ai.nvim",
url = 'sso://googler@user/vvvv/ai.nvim',
},
{
name = "cmp_nvim_ciderlsp",
url = 'sso://googler@user/piloto/cmp-nvim-ciderlsp',
lazy = false;
dependencies = {
'hrsh7th/nvim-cmp',
}
},
{
name = "ciderlsp_nvim",
url = 'sso://googler@user/kdark/ciderlsp-nvim',
lazy = false;
dependencies = {
'hrsh7th/nvim-cmp',
}
},
{
name = "nvim_figtree",
url = "sso://googler@user/jackcogdill/nvim-figtree",
},
{
name = "telescope_codesearch",
url = 'sso://googler@user/vintharas/telescope-codesearch.nvim',
dependencies = { 'nvim-telescope/telescope.nvim' },
},
{
name = "telescope_citc",
url = 'sso://googler@user/aktau/telescope-citc.nvim',
dependencies = { 'nvim-telescope/telescope.nvim' }
},
{
name = "telescope_fig",
url = 'sso://googler@user/tylersaunders/telescope-fig.nvim',
dependencies = { 'nvim-telescope/telescope.nvim' }
},
{
name = "google_comments",
url = 'sso://googler@user/chmnchiang/google-comments',
dependencies = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
config = function()
require("config.google-comments")
end,
},
{
name = "hg",
url = "sso://googler@user/smwang/hg.nvim",
dependencies = { "ipod825/libp.nvim" },
config = function()
require("config.fig")
require("hg").setup()
end,
}
}
else
return {}
end

View File

@ -5,36 +5,6 @@ let g:VCSCommandDisableMappings = 1
let g:signify_skip_filename_pattern = ['\.pipertmp.*']
Glug alert
Glug csearch
" Glug! codefmt ktfmt_executable=`["/google/bin/releases/kotlin-google-eng/ktfmt/ktfmt_deploy.jar", "--google-style"]`
Glug! codefmt
Glug codefmt-google
Glug languages
" applies google coding style settings to files whitelisted as google code. probably also want
Glug googlestyle
" internal spell-checking integration and improved default configuration.
Glug googlespell
" hooks for google-internal virtual file paths such as //depot and /cns.
Glug googlepaths
" core syntax and filetype settings for google-internal filetypes.
Glug google-filetypes
Glug ft-java
Glug ft-kotlin
Glug ft-proto
Glug critique
Glug piper
Glug gtimporter
Glug blaze
let g:blazevim_quickfix_autoopen = 1
Glug buganizer plugin[mappings]
Glug relatedfiles plugin[mappings]
Glug g4
Glug outline-window
Glug fzf-query
function s:blazeExec(cmd, targets)
if len(a:targets) == 0
exe VimuxRunCommand("build_target.py " . expand('%:p') . " " . a:cmd)
@ -160,11 +130,6 @@ com! -nargs=? -complete=file Blame :call G4Blame(<f-args>)
nnoremap <leader>cc :CritiqueUnresolvedComments<space><cr>
" nnoremap <leader>ps :PiperSelectActiveFiles<CR>
nnoremap <leader>ps :FzfHgFiles<CR>
nnoremap <leader>pl :PiperLoadActiveAsBuffers<CR>
nnoremap <leader>po :PiperOpenPath<CR>
nmap <leader>rbs ss <leader>rb
nmap <leader>yb :let @+ = join(blaze#GetTargets(), ' ')<cr>

View File

@ -193,5 +193,3 @@ syntax on
if filereadable(expand("~/use_google"))
source ~/.vim/prefs/google.vim
endif
lua require("config.imp")