From c014d9ea57636f1822dd57659079c9268ccad1ea Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Wed, 10 May 2023 13:31:46 -0500
Subject: [PATCH] in progress

---
 vim/.vim/lua/plugins.lua  | 27 ++++++++++++---------------
 vim/.vim/prefs/google.vim |  3 ++-
 vim/.vimrc                | 20 +-------------------
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua
index 0121a30..eab8097 100644
--- a/vim/.vim/lua/plugins.lua
+++ b/vim/.vim/lua/plugins.lua
@@ -17,8 +17,6 @@ package.path = package.path ..  vim.fn.expand(";$HOME/.vim/lua/?.lua")
 vim.g.mapleader = "," -- Make sure to set `mapleader` before lazy so your mappings are correct
 vim.g.windowswap_map_keys = 0
 
--- require('lspconfig')
-
 require("lazy").setup({
     "folke/which-key.nvim",
     { "folke/neoconf.nvim", cmd = "Neoconf" },
@@ -30,6 +28,7 @@ require("lazy").setup({
 
     {
         "nvim-treesitter/nvim-treesitter",
+        lazy = false,
         build = ":TSUpdate",
         config = function() require("config.nvim-treesitter") end
     },
@@ -85,13 +84,14 @@ require("lazy").setup({
             'ray-x/cmp-treesitter',
         },
         event = 'InsertEnter',
+        lazy = false,
         config = function() require("config.lsp") end,
     },
 
     {
         "tzachar/cmp-tabnine", build = "./install.sh",
         event = 'InsertEnter',
-        cond = not use_google(),
+        enabled = not use_google(),
     },
 
     { 'ErichDonGubler/lsp_lines.nvim', config = function()  require("lsp_lines").setup()  end },
@@ -294,7 +294,7 @@ require("lazy").setup({
 
     -- mine
     {
-        'squk/java-syntax.vim', ft='java'
+        'squk/java-syntax.vim', ft='java', lazy=false
     },
 
     {
@@ -384,17 +384,14 @@ require("lazy").setup({
         end,
     },
 },
-{
-defaults = {
-    --  lazy = true, -- should plugins be lazy-loaded?
-}})
+{ defaults = {lazy = false} })
 
-    -- CiderLSP
-    vim.opt.completeopt = { "menu", "menuone", "noselect" }
-    -- Don't show the dumb matching stuff
-    vim.opt.shortmess:append("c")
+-- 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' }
+vim.opt.spell = true
+vim.opt.spelllang = { 'en_us' }
 
-    require("config.imp")
+require("config.imp")
diff --git a/vim/.vim/prefs/google.vim b/vim/.vim/prefs/google.vim
index f5d6e3a..0d4e0c7 100644
--- a/vim/.vim/prefs/google.vim
+++ b/vim/.vim/prefs/google.vim
@@ -7,7 +7,8 @@ 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 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
diff --git a/vim/.vimrc b/vim/.vimrc
index da984b2..8782fff 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -5,7 +5,6 @@ filetype off                  " required
 set rtp+=~/.vim
 set rtp+=~/.vim/after
 set rtp+=~/.config/nvim/after/
-set rtp+=~/.vim/lua/
 
 set directory=/tmp
 set undodir=/tmp
@@ -91,16 +90,6 @@ endif
 source ~/.vim/prefs/mappings.vim
 source ~/.vim/prefs/leader.vim
 source ~/.vim/prefs/ui.vim
-" source ~/.vim/prefs/fzf.vim
-
-filetype plugin on     " redundant?
-filetype plugin indent on
-
-" auto-reload vimrc on save
-augroup myvimrc
-    au!
-au BufWritePost .vimrc,_vimrc,.vimrc.local,vimrc,.gvimrc,_gvimrc,gvimrc,*.vim nested so $MYVIMRC | if has('gui_running') | so $MYGVIMRC | endif
-augroup END
 
 fun! NewInitBex()
     let &bex = '-' . strftime("(%Y%m%d)-{%H%M}")
@@ -115,13 +104,6 @@ set t_Co=256
 
 let base16colorspace=256
 set colorcolumn=100
-if has('macunix')
-    let g:python3_host_prog='/usr/local/bin/python3'
-    let g:python_host_prog='/usr/local/bin/python3'
-else
-    let g:python3_host_prog='/usr/bin/python3'
-    let g:python_host_prog='/usr/bin/python'
-endif
 
 if (has("termguicolors"))
  set termguicolors
@@ -209,5 +191,5 @@ function! s:AddBufferToTab()
   tabfirst
 endfun
 
+filetype plugin indent on
 lua require("plugins")
-