From 2392424b2a8e9e75ecd9b1d85367ce14ed7455c6 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Mon, 27 Mar 2023 12:46:29 -0500
Subject: [PATCH] fix

---
 git/.gitconfig                 |  2 ++
 vim/.vim/lua/config/google.lua |  7 ++++---
 vim/.vim/lua/plugins.lua       | 19 +++++++++----------
 vim/.vimrc                     |  4 ++--
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 021d71f..3c39c00 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -35,3 +35,5 @@
     # list aliases
     la = "!git config -l | grep alias | cut -c 7-"
     po = push origin
+[core]
+	autocrlf = false
diff --git a/vim/.vim/lua/config/google.lua b/vim/.vim/lua/config/google.lua
index c956a1e..92cd694 100644
--- a/vim/.vim/lua/config/google.lua
+++ b/vim/.vim/lua/config/google.lua
@@ -7,15 +7,15 @@ function M.config(use)
     }
     use {
         'sso://googler@user/vintharas/telescope-codesearch.nvim',
-        after = { 'nvim-telescope/telescope.nvim' }
+        requires = { 'nvim-telescope/telescope.nvim' }
     }
     use {
         'sso://googler@user/aktau/telescope-citc.nvim',
-        after = { 'nvim-telescope/telescope.nvim' }
+        requires = { 'nvim-telescope/telescope.nvim' }
     }
     use {
         'sso://googler@user/tylersaunders/telescope-fig.nvim',
-        after = { 'nvim-telescope/telescope.nvim' }
+        requires = { 'nvim-telescope/telescope.nvim' }
     }
 
     use {
@@ -39,4 +39,5 @@ function M.config(use)
         end,
     }
 end
+
 return M
diff --git a/vim/.vim/lua/plugins.lua b/vim/.vim/lua/plugins.lua
index a1f0367..c57f1e0 100644
--- a/vim/.vim/lua/plugins.lua
+++ b/vim/.vim/lua/plugins.lua
@@ -124,9 +124,12 @@ require('packer').startup(function(use)
         config = [[ require("config.null-ls") ]],
     }
 
-    if use_google() then
-        require 'config.google'.config(use)
-    end
+    use {
+        'nvim-telescope/telescope.nvim',
+        branch = '0.1.x',
+        config = [[ require("config.telescope") ]]
+    }
+    use 'nvim-telescope/telescope-file-browser.nvim'
 
     use { 'vim-scripts/vcscommand.vim' }
 
@@ -159,13 +162,6 @@ require('packer').startup(function(use)
     use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline")]]  }
     use { 'petertriho/nvim-scrollbar', config = [[ require("scrollbar").setup()]] }
 
-    use {
-        'nvim-telescope/telescope.nvim',
-        branch = '0.1.x',
-        config = [[ require("config.telescope") ]]
-    }
-    use 'nvim-telescope/telescope-file-browser.nvim'
-
     use {
         'rmagatti/auto-session',
         config = function()
@@ -272,6 +268,9 @@ require('packer').startup(function(use)
         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
diff --git a/vim/.vimrc b/vim/.vimrc
index ba496a1..0776087 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -97,8 +97,6 @@ source ~/.vim/prefs/leader.vim
 source ~/.vim/prefs/ui.vim
 " source ~/.vim/prefs/fzf.vim
 
-lua require("plugins")
-
 filetype plugin on     " redundant?
 filetype plugin indent on
 
@@ -181,3 +179,5 @@ let g:loaded_netrw             = 1
 let g:loaded_netrwPlugin       = 1
 let g:loaded_tutor_mode_plugin = 1
 let g:loaded_remote_plugins    = 1
+
+lua require("plugins")