Start lazy.nvim migrations

This commit is contained in:
Christian Nieves
2023-06-08 14:21:19 -05:00
parent 18b252d6a3
commit 648ef29b69
9 changed files with 450 additions and 387 deletions

View File

@ -1,44 +1 @@
local M = {}
function M.config(use)
use 'sso://googler@user/vvvv/ai.nvim'
use {
'sso://googler@user/piloto/cmp-nvim-ciderlsp',
'sso://googler@user/kdark/ciderlsp-nvim',
"sso://googler@user/jackcogdill/nvim-figtree",
}
use {
'sso://googler@user/vintharas/telescope-codesearch.nvim',
requires = { 'nvim-telescope/telescope.nvim' }
}
use {
'sso://googler@user/aktau/telescope-citc.nvim',
requires = { 'nvim-telescope/telescope.nvim' }
}
use {
'sso://googler@user/tylersaunders/telescope-fig.nvim',
requires = { 'nvim-telescope/telescope.nvim' }
}
use {
'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',
requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
config = [[ require("config.google-comments") ]]
}
use {
'/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
config = [[ require("critique").setup() ]]
}
use {
"sso://googler@user/smwang/hg.nvim",
requires = { "ipod825/libp.nvim" },
config = function()
require("config.fig")
require("hg").setup()
end,
}
end
return M

View File

@ -12,7 +12,7 @@ sync_install = false,
indent = {
enable = true
},
-- disable = {"java"},
disable = {"java"},
--
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).

View File

@ -0,0 +1,27 @@
local fn = vim.fn
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({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
end
vim.opt.rtp:prepend(lazypath)
require("lazy").setup("plugins")
-- CiderLSP
vim.opt.completeopt = { "menu", "menuone", "noselect" }
-- Don't show the dumb matching stuff
vim.opt.shortmess:append("c")
vim.opt.spell = true
vim.opt.spelllang = { 'en_us' }
require("config.imp")

View File

@ -1,293 +0,0 @@
local fn = vim.fn
local use_google = require("utils").use_google
local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
if fn.empty(fn.glob(install_path)) > 0 then
packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. vim.o.runtimepath
end
vim.cmd([[
augroup packer_user_config
autocmd!
autocmd BufWritePost plugins.lua source <afile> | PackerCompile
augroup end
]])
require('packer').startup(function(use)
-- Packer can manage itself
use 'wbthomason/packer.nvim'
use 'lewis6991/impatient.nvim'
use 'dstein64/vim-startuptime'
use 'will133/vim-dirdiff'
-- use {
-- 'google/vim-glaive',
-- after = {
-- 'google/vim-maktaba',
-- }
-- -- disable = use_google(),
-- -- cond = not use_google(),
-- }
-- use {
-- 'google/vim-maktaba',
-- -- disable = use_google(),
-- -- cond = not use_google(),
-- }
-- use {
-- 'flwyd/vim-imp',
-- disable = use_google(),
-- -- cond = not use_google(),
-- after = {
-- 'google/vim-maktaba',
-- 'google/vim-glaive',
-- }
-- }
use {
'nvim-treesitter/nvim-treesitter',
run = ':TSUpdate',
config = [[ require("config.nvim-treesitter") ]]
}
-- Unless you are still migrating, remove the deprecated commands from v1.x
vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
use {
"nvim-neo-tree/neo-tree.nvim",
branch = "v2.x",
config = [[ require("config.neotree") ]],
requires = {
"nvim-lua/plenary.nvim",
"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
"MunifTanjim/nui.nvim",
}
}
-- Undo tree
use {
'mbbill/undotree',
cmd = 'UndotreeToggle',
config = [[vim.g.undotree_SetFocusWhenToggle = 1]],
}
use 'nvim-lua/plenary.nvim'
use {
'renerocksai/telekasten.nvim',
config = [[ require("config.telekasten") ]]
}
use 'renerocksai/calendar-vim'
use 'google/vim-searchindex'
use { 'ray-x/go.nvim',ft='go' }
use { 'ray-x/guihua.lua',ft='go' }
-- Pretty symbols
use 'kyazdani42/nvim-web-devicons'
use({"L3MON4D3/LuaSnip", tag = "v<CurrentMajor>.*"})
-- Completion and linting
use 'neovim/nvim-lspconfig'
use {
'hrsh7th/nvim-cmp',
requires = {
'onsails/lspkind.nvim',
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-buffer',
'lukas-reineke/cmp-under-comparator',
'hrsh7th/cmp-cmdline',
'f3fora/cmp-spell',
'hrsh7th/cmp-nvim-lsp-document-symbol',
'hrsh7th/cmp-nvim-lsp-signature-help',
'hrsh7th/cmp-nvim-lua',
'hrsh7th/cmp-path',
'hrsh7th/cmp-vsnip',
'ray-x/cmp-treesitter',
{ 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} },
},
config = [[ require("config.lsp") ]],
}
use {
"tzachar/cmp-tabnine", run = "./install.sh",
event = 'InsertEnter',
cond = not use_google(),
}
use { 'ErichDonGubler/lsp_lines.nvim', config = [[ require("lsp_lines").setup() ]] }
use {
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
'VonHeikemen/lsp-zero.nvim',
}
use {
'jose-elias-alvarez/null-ls.nvim',
config = [[ require("config.null-ls") ]],
}
use {
'nvim-telescope/telescope.nvim',
branch = '0.1.x',
config = [[ require("config.telescope") ]]
}
use 'nvim-telescope/telescope-file-browser.nvim'
-- Rust
use {
'saecki/crates.nvim',
ft = 'rust',
tag = 'v0.3.0',
requires = { 'nvim-lua/plenary.nvim' },
config = [[ require('crates').setup() ]]
}
use {'simrat39/rust-tools.nvim', ft = 'rust'}
use {
'folke/trouble.nvim',
config = [[ require("config.trouble") ]]
}
use {
'ThePrimeagen/refactoring.nvim',
requires = {
{"nvim-lua/plenary.nvim"},
{"nvim-treesitter/nvim-treesitter"}
},
config = [[ require("config.refactoring") ]]
}
use 'apalmer1377/factorus'
use 'hrsh7th/vim-vsnip'
use 'kosayoda/nvim-lightbulb'
use {'andymass/vim-matchup', event = 'VimEnter'}
use 'jghauser/mkdir.nvim'
use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline")]] }
use { 'petertriho/nvim-scrollbar', config = [[ require("scrollbar").setup()]] }
use {
'rmagatti/auto-session',
config = function()
require("auto-session").setup {
log_level = "error",
auto_session_suppress_dirs = { "~/", "~/Downloads", "/", os.getenv("HOME")},
}
end
}
use {
"ipod825/libp.nvim",
config = function()
require("libp").setup()
end,
}
use 'nvim-lua/lsp-status.nvim'
use {
'nvim-lualine/lualine.nvim',
config = [[ require("config.lualine") ]]
}
use {
'rcarriga/nvim-notify',
config = [[require("config.notify")]]
}
-- Git
use {
{
'lewis6991/gitsigns.nvim',
requires = 'nvim-lua/plenary.nvim',
event = 'User ActuallyEditing',
},
{
'akinsho/git-conflict.nvim',
tag = '*',
config = [[ require('git-conflict').setup() ]],
},
{ 'rhysd/conflict-marker.vim' }
}
-- use { "catppuccin/nvim", as = "catppuccin" }
use { "catppuccin/nvim", as = "catppuccin", config = [[ require("config.catppuccin") ]]}
-- Tmux
use {
'preservim/vimux',
'tmux-plugins/vim-tmux',
'christoomey/vim-tmux-navigator',
'whatyouhide/vim-tmux-syntax',
'tmux-plugins/vim-tmux-focus-events',
'jabirali/vim-tmux-yank',
'skywind3000/asyncrun.vim',
}
use {
'ojroques/nvim-osc52',
config = [[ require("config.oscyank") ]]
}
-- mine
use {
'squk/java-syntax.vim', ft='java'
}
use {
"folke/which-key.nvim",
config = [[ require("config.whichkey") ]]
}
use 'ntpeters/vim-better-whitespace'
use 'junegunn/fzf.vim'
use { 'junegunn/fzf', run = ":call fzf#install()" }
vim.opt.rtp:append(os.getenv("HOME") .. "/.fzf")
use 'nathanaelkane/vim-indent-guides'
use 'tversteeg/registers.nvim'
use 'jremmen/vim-ripgrep'
use { 'udalov/kotlin-vim', ft='kotin' }
use {
'wesQ3/vim-windowswap',
setup = [[ vim.g.windowswap_map_keys = 0 ]]
}
use 'tpope/vim-surround'
use 'scrooloose/nerdcommenter'
use { 'vim-scripts/vcscommand.vim' }
use {
'mhinz/vim-signify',
config= [[require('config.signify')]]
}
use {
'j-hui/fidget.nvim',
config = [[ require("fidget").setup() ]]
}
use {
"iamcco/markdown-preview.nvim",
run = "cd app && npm install",
setup = function() vim.g.mkdp_filetypes = { "markdown" } end,
ft = { "markdown" }
}
if use_google() then
require 'config.google'.config(use)
end
-- Automatically set up your configuration after cloning packer.nvim
-- Put this at the end after all plugins
if packer_bootstrap then
require('packer').sync()
end
end)
-- CiderLSP
vim.opt.completeopt = { "menu", "menuone", "noselect" }
-- Don't show the dumb matching stuff
vim.opt.shortmess:append("c")
vim.opt.spell = true
vim.opt.spelllang = { 'en_us' }
require("config.imp")

View File

@ -0,0 +1,281 @@
local use_google = require("utils").use_google
return
{
-- Pretty symbols
'kyazdani42/nvim-web-devicons',
'nvim-lua/lsp-status.nvim',
'jghauser/mkdir.nvim',
'lewis6991/impatient.nvim',
'dstein64/vim-startuptime',
'will133/vim-dirdiff',
'renerocksai/calendar-vim',
'google/vim-searchindex',
'apalmer1377/factorus',
'hrsh7th/vim-vsnip',
'kosayoda/nvim-lightbulb',
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
'VonHeikemen/lsp-zero.nvim',
'tpope/vim-surround',
'scrooloose/nerdcommenter',
'ntpeters/vim-better-whitespace',
'junegunn/fzf.vim',
'nathanaelkane/vim-indent-guides',
'tversteeg/registers.nvim',
'jremmen/vim-ripgrep',
'nvim-lua/plenary.nvim',
{
'nvim-treesitter/nvim-treesitter',
build = ':TSUpdate',
config = function()
require("config.nvim-treesitter")
end,
lazy = false,
},
{
"nvim-neo-tree/neo-tree.nvim",
branch = "v2.x",
config = function()
require("config.neotree")
end,
dependencies = {
"nvim-lua/plenary.nvim",
"MunifTanjim/nui.nvim",
},
keys = {
{ "<C-n>", ":Neotree filesystem reveal toggle reveal_force_cwd<cr>", desc = "Open NeoTree" },
},
},
-- Undo tree
{
'mbbill/undotree',
cmd = 'UndotreeToggle',
config = function()
vim.g.undotree_SetFocusWhenToggle = 1
end
},
{
'renerocksai/telekasten.nvim',
config = function()
require("config.telekasten")
end,
keys = {
{ "<leader>zf", ":lua require('telekasten').find_notes()<CR>", desc = "Find Notes" },
},
},
{ 'ray-x/go.nvim',ft='go' },
{ 'ray-x/guihua.lua',ft='go' },
-- Completion and linting
'neovim/nvim-lspconfig',
{
'hrsh7th/nvim-cmp',
event = "InsertEnter",
dependencies = {
'onsails/lspkind.nvim',
'hrsh7th/cmp-nvim-lsp',
'hrsh7th/cmp-buffer',
'lukas-reineke/cmp-under-comparator',
'hrsh7th/cmp-cmdline',
'f3fora/cmp-spell',
'hrsh7th/cmp-nvim-lsp-document-symbol',
'hrsh7th/cmp-nvim-lsp-signature-help',
'hrsh7th/cmp-nvim-lua',
'hrsh7th/cmp-path',
'hrsh7th/cmp-vsnip',
'ray-x/cmp-treesitter',
},
config = function()
require("config.lsp")
end
},
{
"tzachar/cmp-tabnine", build = "./install.sh",
event = 'InsertEnter',
cond = not use_google(),
},
{
'ErichDonGubler/lsp_lines.nvim',
event = "InsertEnter",
config = function()
require("lsp_lines").setup()
end
},
{
'jose-elias-alvarez/null-ls.nvim',
event = "InsertEnter",
config = function()
require("config.null-ls")
end
},
{
'nvim-telescope/telescope.nvim',
branch = '0.1.x',
config = function()
require("config.telescope")
end
},
'nvim-telescope/telescope-file-browser.nvim',
-- Rust
{
'saecki/crates.nvim',
ft = 'rust',
version = 'v0.3.0',
dependencies = { 'nvim-lua/plenary.nvim' },
config = function()
require('crates').setup()
end
},
{'simrat39/rust-tools.nvim', ft = 'rust'},
{
'folke/trouble.nvim',
config = function()
require("config.trouble")
end
},
{
'ThePrimeagen/refactoring.nvim',
dependencies = {
{"nvim-lua/plenary.nvim"},
{"nvim-treesitter/nvim-treesitter"}
},
config = function()
require("config.refactoring")
end
},
{'andymass/vim-matchup', event = 'VimEnter'},
{ 'simrat39/symbols-outline.nvim', config = function()
require("config.symbols-outline")
end
},
{
'petertriho/nvim-scrollbar', config = function()
require("scrollbar").setup()
end,
lazy = false,
},
{
'rmagatti/auto-session',
config = function()
require("auto-session").setup {
log_level = "error",
auto_session_suppress_dirs = { "~/", "~/Downloads", "/", os.getenv("HOME")},
}
end
},
{
"ipod825/libp.nvim",
config = function()
require("libp").setup()
end,
},
{
'nvim-lualine/lualine.nvim',
lazy = false,
config = function()
require("config.lualine")
end
},
{
'rcarriga/nvim-notify',
config = function()
require("config.notify")
end
},
-- Git
{
{
'lewis6991/gitsigns.nvim',
dependencies = 'nvim-lua/plenary.nvim',
event = 'User ActuallyEditing',
},
{
'akinsho/git-conflict.nvim',
version = '*',
config = function()
require('git-conflict').setup()
end,
},
{ 'rhysd/conflict-marker.vim' }
},
{
"catppuccin/nvim",
name = "catppuccin",
lazy = false, -- make sure we load this during startup if it is your main colorscheme
priority = 1000, -- make sure to load this before all the other start plugins
config = function()
require("config.catppuccin")
end
},
{
'ojroques/nvim-osc52',
config = function()
require("config.oscyank")
end
},
-- mine
{
'squk/java-syntax.vim', ft='java'
},
{
"folke/which-key.nvim",
config = function()
require("config.whichkey")
end
},
{ 'junegunn/fzf', build = ":call fzf#install()" },
{ 'udalov/kotlin-vim', ft='kotin' },
{
'wesQ3/vim-windowswap',
init = function()
vim.g.windowswap_map_keys = 0
end,
},
{ 'vim-scripts/vcscommand.vim' },
{
'mhinz/vim-signify',
config= function()
require('config.signify')
end
},
{
'j-hui/fidget.nvim',
init = function() require("fidget").setup() end
},
{
"iamcco/markdown-preview.nvim",
build = "cd app && npm install",
setup = function()
vim.g.mkdp_filetypes = { "markdown" }
end,
ft = { "markdown" }
},
}

View File

@ -0,0 +1,83 @@
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',
},
{
name = "ciderlsp_nvim",
url = 'sso://googler@user/kdark/ciderlsp-nvim',
},
{
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,
}
}
-- {
-- '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',
-- }
-- }

View File

@ -0,0 +1,9 @@
return {
'preservim/vimux',
'tmux-plugins/vim-tmux',
'christoomey/vim-tmux-navigator',
'whatyouhide/vim-tmux-syntax',
'tmux-plugins/vim-tmux-focus-events',
'jabirali/vim-tmux-yank',
'skywind3000/asyncrun.vim',
}