organize plugins

scripts/scripts/maxfiles

@@ -0,0 +1 @@
+sudo launchctl limit maxfiles 65536 200000

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

@@ -0,0 +1,42 @@
+local M = {}
+function M.config(use)
+    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',
+        after = { 'nvim-telescope/telescope.nvim' }
+    }
+    use {
+        'sso://googler@user/aktau/telescope-citc.nvim',
+        after = { 'nvim-telescope/telescope.nvim' }
+    }
+    use {
+        'sso://googler@user/tylersaunders/telescope-fig.nvim',
+        after = { '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/plugins.lua

@@ -1,6 +1,6 @@
 local fn = vim.fn
-local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
 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
@@ -21,22 +21,32 @@ require('packer').startup(function(use)
     use 'lewis6991/impatient.nvim'
     use 'dstein64/vim-startuptime'
 
-    use {
+    if use_google() then
-        'google/vim-maktaba',
+        require 'config.google'.config(use)
-        config = [[ vim.cmd("call glaive#Install()")]],
+    end
-        disable = use_google(),
+
-        after  =  {
+    -- use {
-            'flwyd/vim-imp',
+    --     'google/vim-glaive',
-        }
+    --     after  =  {
-    }
+    --         'google/vim-maktaba',
-    use {
+    --     }
-        'flwyd/vim-imp',
+    --     -- disable = use_google(),
-        disable = use_google(),
+    --     -- cond = not use_google(),
-    }
+    -- }
-    use {
+    -- use {
-        'google/vim-glaive',
+    --     'google/vim-maktaba',
-        disable = use_google(),
+    --     -- 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',
@@ -130,13 +140,6 @@ require('packer').startup(function(use)
     }
     use 'apalmer1377/factorus'
 
-    -- use {
-        --     'mfussenegger/nvim-dap',
-        --     'mfussenegger/nvim-jdtls',
-        --     ft = {'java','kotlin'},
-        --     config = [[ require("config.dap")]],
-        -- }
-
     use 'hrsh7th/vim-vsnip'
     use 'kosayoda/nvim-lightbulb'
     use {'andymass/vim-matchup', event = 'VimEnter'}
@@ -162,30 +165,6 @@ require('packer').startup(function(use)
         end
     }
 
-        use {
-            'sso://googler@user/piloto/cmp-nvim-ciderlsp',
-            'sso://googler@user/kdark/ciderlsp-nvim',
-            'sso://googler@user/vintharas/telescope-codesearch.nvim',
-            'sso://googler@user/aktau/telescope-citc.nvim',
-            'sso://googler@user/tylersaunders/telescope-fig.nvim',
-
-            cond = use_google(),
-        }
-
-        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',
-            cond = use_google(),
-            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',
-            cond = use_google(),
-            config = [[ require("critique").setup() ]]
-        }
 
     use {
         "ipod825/libp.nvim",
@@ -193,19 +172,6 @@ require('packer').startup(function(use)
             require("libp").setup()
         end,
     }
-        use {
-            "sso://googler@user/jackcogdill/nvim-figtree",
-            cond = use_google(),
-        }
-        use {
-            "sso://googler@user/smwang/hg.nvim",
-            requires =  { "ipod825/libp.nvim" },
-            config = function()
-                require("config.fig")
-                require("hg").setup()
-            end,
-            cond = use_google(),
-        }
 
     use 'nvim-lua/lsp-status.nvim'
     use {
@@ -289,9 +255,16 @@ require('packer').startup(function(use)
         'mhinz/vim-signify',
         config= [[require('config.signify')]]
     }
-
+    use {
-        use { 'j-hui/fidget.nvim', config = [[require("fidget").setup()]] }
+        'j-hui/fidget.nvim',
-        use({ "iamcco/markdown-preview.nvim", run = "cd app && npm install", setup = function() vim.g.mkdp_filetypes = { "markdown" } end, ft = { "markdown" }, })
+        config = [[require("fidget").setup()]]
+    }
+    use {
+        "iamcco/markdown-preview.nvim",
+        run = "cd app && npm install",
+        setup = function() vim.g.mkdp_filetypes = { "markdown" } end,
+        ft = { "markdown" }
+    }
 
 
     -- Automatically set up your configuration after cloning packer.nvim
@@ -299,14 +272,14 @@ require('packer').startup(function(use)
     if packer_bootstrap then
         require('packer').sync()
     end
-    end)
+end)
 
-    -- CiderLSP
+-- CiderLSP
-    vim.opt.completeopt = { "menu", "menuone", "noselect" }
+vim.opt.completeopt = { "menu", "menuone", "noselect" }
-    -- Don't show the dumb matching stuff
+-- Don't show the dumb matching stuff
-    vim.opt.shortmess:append("c")
+vim.opt.shortmess:append("c")
 
-    vim.opt.spell = true
+vim.opt.spell = true
-    vim.opt.spelllang = { 'en_us' }
+vim.opt.spelllang = { 'en_us' }
 
-    require("config.imp")
+require("config.imp")