Start lazy.nvim migrations

config/.config/nvim/lazy-lock.json

@@ -1,12 +1,12 @@
 {
+  "ai.nvim": { "branch": "main", "commit": "d7391d4782b90ad3501f6f716f2b308092981787" },
   "asyncrun.vim": { "branch": "master", "commit": "7191d0c30dd105e5d7f897b9a6ee19cabe734466" },
   "auto-session": { "branch": "main", "commit": "21033c6815f249a7839c3a85fc8a6b44d74925c9" },
   "calendar-vim": { "branch": "master", "commit": "a7e73e02c92566bf427b2a1d6a61a8f23542cc21" },
-  "catppuccin": { "branch": "main", "commit": "57b421ee5f7380f816791fa451e86f213b625ece" },
+  "catppuccin": { "branch": "main", "commit": "233c4175780d9b4e39ae4fe4535c1e4c14bd76ed" },
-  "ciderlsp-nvim": { "branch": "main", "commit": "7007e1881eb421a4d6f7ef1f31e973f7cc0b4d8d" },
+  "ciderlsp_nvim": { "branch": "main", "commit": "7007e1881eb421a4d6f7ef1f31e973f7cc0b4d8d" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-cmdline": { "branch": "main", "commit": "5af1bb7d722ef8a96658f01d6eb219c4cf746b32" },
+  "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
-  "cmp-nvim-ciderlsp": { "branch": "main", "commit": "e1b0015a0c090e20d1cbb34e5639e6dd145d3f3e" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
   "cmp-nvim-lsp-document-symbol": { "branch": "main", "commit": "f0f53f704c08ea501f9d222b23491b0d354644b0" },
   "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" },
@@ -17,69 +17,68 @@
   "cmp-treesitter": { "branch": "master", "commit": "389eadd48c27aa6dc0e6b992644704f026802a2e" },
   "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "cmp_nvim_ciderlsp": { "branch": "main", "commit": "e1b0015a0c090e20d1cbb34e5639e6dd145d3f3e" },
   "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
   "crates.nvim": { "branch": "main", "commit": "1dffccc0a95f656ebe00cacb4de282473430c5a1" },
   "factorus": { "branch": "master", "commit": "19816e370df82fe96ca96856cf2be4d1c82302da" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "fzf": { "branch": "master", "commit": "94999101e358385f3ca67a6ec9512f549196b802" },
+  "fzf": { "branch": "master", "commit": "3e9efd1401404da8afdcf9757ac9996f5c48290f" },
-  "fzf.vim": { "branch": "master", "commit": "dc71692255b62d1f67dc55c8e51ab1aa467b1d46" },
+  "fzf.vim": { "branch": "master", "commit": "5d87ac1fe8d729f116bda2f90a7211ad309ddf5a" },
-  "git-conflict.nvim": { "branch": "main", "commit": "e83d9cc866338ed75b886d5a98c9ff03da99434d" },
+  "git-conflict.nvim": { "branch": "main", "commit": "8d962d83cae924a314965f738ed1e05a4000d682" },
-  "gitsigns.nvim": { "branch": "main", "commit": "814158f6c4b1724c039fcefe79b0be72c9131c2d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" },
-  "go.nvim": { "branch": "master", "commit": "b119217e8324f13a2be12935f5d2d15a1df09b09" },
+  "go.nvim": { "branch": "master", "commit": "a8095eb334495caec3099b717cc7f5b1fbc3e628" },
-  "google-comments": { "branch": "main", "commit": "ad50cd3c71a7553c92a966dba6a03232a81e3812" },
+  "google_comments": { "branch": "main", "commit": "ad50cd3c71a7553c92a966dba6a03232a81e3812" },
   "guihua.lua": { "branch": "master", "commit": "ab8b1f09603cc268770efd057115035dc6cfa83d" },
-  "hg.nvim": { "branch": "main", "commit": "f9bab452d778f74976430f091a8830ec2d8a3720" },
+  "hg": { "branch": "main", "commit": "f9bab452d778f74976430f091a8830ec2d8a3720" },
   "impatient.nvim": { "branch": "main", "commit": "47302af74be7b79f002773011f0d8e85679a7618" },
   "java-syntax.vim": { "branch": "master", "commit": "9a3d76a8c6cd7765ba93a7bdd9280594167e3f1b" },
   "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" },
-  "lazy.nvim": { "branch": "main", "commit": "652b6febf8d5c99eb8cf4a1cec63da6db62e77d2" },
+  "lazy.nvim": { "branch": "main", "commit": "d1b02c2dda88422ca573f2a1ebdfb213ce0124d6" },
   "libp.nvim": { "branch": "main", "commit": "db62a17ad68946d970bca0b0736e854058d3b307" },
   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" },
-  "lsp-zero.nvim": { "branch": "v2.x", "commit": "7c7977cbcff64f8b057bcba0d15ea17e75bf90d2" },
+  "lsp-zero.nvim": { "branch": "v2.x", "commit": "8fda9a849d6ab4196ecf129905764ddefdfb64b5" },
   "lsp_lines.nvim": { "branch": "main", "commit": "3b57922d2d79762e6baedaf9d66d8ba71f822816" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
   "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "90a8bbf106b85b76951a34c542058ffa807de2b1" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" },
-  "mason.nvim": { "branch": "main", "commit": "a51391311e86c295fc7611be2beb58859e93f21b" },
+  "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
-  "neo-tree.nvim": { "branch": "v2.x", "commit": "541f5c92d2492041afb354e2df6e74809094b051" },
+  "neo-tree.nvim": { "branch": "v2.x", "commit": "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa" },
-  "neoconf.nvim": { "branch": "main", "commit": "6086792a14a4490b227075a847f4226c07ed7eac" },
+  "nerdcommenter": { "branch": "master", "commit": "b0b09ea46c9f0509556257bd8b838b40f493d6a0" },
-  "neodev.nvim": { "branch": "main", "commit": "6498a07601702349c31909005bb333003e4687d4" },
+  "nui.nvim": { "branch": "main", "commit": "bd2fefb2efac70231fee497137295333dd4ada30" },
-  "nerdcommenter": { "branch": "master", "commit": "277bdfc6796479639b4c580d2089e2a34962cd1f" },
+  "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" },
-  "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" },
+  "nvim-cmp": { "branch": "main", "commit": "b5a636d46c69bb371995c22d7a10ee1544004879" },
-  "null-ls.nvim": { "branch": "main", "commit": "08bb00c7c2cd58c72e02cf54e4b9cbfe14b03e09" },
-  "nvim-cmp": { "branch": "main", "commit": "935b4069ce73b60ba9075bf05ee6ab50ed3af1a9" },
-  "nvim-figtree": { "branch": "main", "commit": "ea52b470a47114abfeec903306c55d8322298e00" },
   "nvim-lightbulb": { "branch": "master", "commit": "ca5b44a8efffb5fec1963ccd21f25ec04cc778b7" },
-  "nvim-lspconfig": { "branch": "master", "commit": "84717430fb6f51c9e9cc8d63da10cceafc91500c" },
+  "nvim-lspconfig": { "branch": "master", "commit": "0f598b9ab9f2a6d7e137074be99c8d89af44b990" },
-  "nvim-notify": { "branch": "master", "commit": "159c6cf1be25a933f35e97499314c9faab55c98f" },
+  "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
-  "nvim-osc52": { "branch": "main", "commit": "47ce7ee2396fa3ee4fb6b0e0ef14ba06f9c9bd31" },
+  "nvim-osc52": { "branch": "main", "commit": "3e96035d62290183fe7a11418db2b254fcfcaee3" },
-  "nvim-scrollbar": { "branch": "main", "commit": "f3a5469e9881360e70d34b25333c910ee4a505f3" },
+  "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
-  "nvim-treesitter": { "branch": "master", "commit": "73c7af9cdbce9330eeb9771639c86269f6d7cf9d" },
+  "nvim-treesitter": { "branch": "master", "commit": "2c59e0ff3da6514b03d853ebecb6c36c515a5d7d" },
-  "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" },
+  "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },
-  "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
+  "nvim_figtree": { "branch": "main", "commit": "9bc3025f46e34732382da1019e256a9d8bec1e55" },
-  "refactoring.nvim": { "branch": "master", "commit": "47a1716a9020c0093a1c8af36c3f9434dae62bbd" },
+  "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" },
+  "refactoring.nvim": { "branch": "master", "commit": "a85dfff2602b739627b9f8a831de8c3e7b2993ae" },
   "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
   "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
   "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" },
-  "telekasten.nvim": { "branch": "main", "commit": "617469cd0690c84264f7d472cf1fe860ccfc0832" },
+  "telekasten.nvim": { "branch": "main", "commit": "36dad2692974a5cc69813441442ccce8c53fbfd4" },
-  "telescope-citc.nvim": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "fc70589a93d7bb42f4671ad75c8628a29995bcbe" },
-  "telescope-codesearch.nvim": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "533c7fb1b3fb412a16e1c1c9cf6d2b1ac130f1b7" },
-  "telescope-fig.nvim": { "branch": "main", "commit": "90150e1aa368b49a5125689b3a6da573a99e2bda" },
+  "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "4054a5d0ab85475bf75df00cf10754d2e54b5532" },
+  "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
-  "telescope.nvim": { "branch": "master", "commit": "d77b37f4520e5fc2cf4c74c12e42ed4b589bd367" },
+  "telescope_fig": { "branch": "main", "commit": "90150e1aa368b49a5125689b3a6da573a99e2bda" },
-  "trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" },
+  "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" },
   "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" },
   "vcscommand.vim": { "branch": "master", "commit": "2fb32681361f37533455d20aaa7fc6eb11b0fa4b" },
   "vim-better-whitespace": { "branch": "master", "commit": "1b22dc57a2751c7afbc6025a7da39b7c22db635d" },
   "vim-dirdiff": { "branch": "master", "commit": "84bc8999fde4b3c2d8b228b560278ab30c7ea4c9" },
   "vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" },
-  "vim-matchup": { "branch": "master", "commit": "6c8909b682803d8c3a054259079f158a73a0e30f" },
+  "vim-matchup": { "branch": "master", "commit": "3625e099b09bff2db5f04082cb09ba679525980c" },
   "vim-ripgrep": { "branch": "master", "commit": "2bb2425387b449a0cd65a54ceb85e123d7a320b8" },
   "vim-searchindex": { "branch": "master", "commit": "b0788c8213210b3bd23b62847dd5a9ebbe4ad648" },
   "vim-signify": { "branch": "master", "commit": "7d538b77a5a8806e344b057f8846f6d0c035efa9" },
-  "vim-startuptime": { "branch": "master", "commit": "01b67169c3ebe41f163c07bf6853555ca19bc27f" },
+  "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "vim-tmux": { "branch": "master", "commit": "cfe76281efc29890548cf9eedd42ad51c7a1faf0" },
   "vim-tmux-focus-events": { "branch": "master", "commit": "b1330e04ffb95ede8e02b2f7df1f238190c67056" },
@@ -89,5 +88,5 @@
   "vim-vsnip": { "branch": "master", "commit": "7753ba9c10429c29d25abfd11b4c60b76718c438" },
   "vim-windowswap": { "branch": "master", "commit": "15db3f697aa1fa696d99fcdc920c90cd2cec855e" },
   "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" },
-  "which-key.nvim": { "branch": "main", "commit": "015fdf3e3e052d4a9fee997ca0aa387c2dd3731c" }
+  "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" }
 }

vim/.vim/lua/config/google.lua

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

vim/.vim/lua/config/nvim-treesitter.lua

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

vim/.vim/lua/plugin_init.lua

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

vim/.vim/lua/plugins.lua

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

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

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

vim/.vim/lua/plugins/google.lua

@@ -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',
+    --     }
+    -- }
+

vim/.vim/lua/plugins/tmux.lua

@@ -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',
+}

vim/.vimrc

@@ -2,9 +2,12 @@ set nocompatible              " be iMproved, required
 
 let mapleader="," " BEST LEADER OF ALL TIME (BLOT)
 filetype off                  " required
-set rtp+=~/.vim
+set runtimepath+=,~/.vim
-set rtp+=~/.vim/after
+set runtimepath+=,~/.vim/after
-set rtp+=~/.config/nvim/after/
+set runtimepath+=,~/.vim/lua/
+set runtimepath+=,~/.vim/lua/plugins
+set runtimepath+=,~/.config/nvim/after/
+let &runtimepath = &runtimepath
 
 set directory=/tmp
 set undodir=/tmp
@@ -79,11 +82,6 @@ set omnifunc= completeopt=menuone,noinsert,noselect
 
 set updatetime=100
 
-lua require('impatient')
-" Enable profiling data
-" lua require'impatient'.enable_profile()
-
-
 if filereadable(expand("~/.vimrc.local"))
   source ~/.vimrc.local
 endif
@@ -196,5 +194,7 @@ function! s:AddBufferToTab()
   tabfirst
 endfun
 
+lua require('plugin_init')
+
 filetype plugin indent on
-lua require("plugins")
+syntax on