From ee37020734428fb5a0021bd63d43c3af83b41036 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Mon, 28 Aug 2023 19:23:24 +0000
Subject: [PATCH] Fix neotree

---
 config/.config/nvim/lazy-lock.json |  1 -
 vim/.vim/lua/config/fig.lua        |  1 -
 vim/.vim/lua/plugins/neotree.lua   |  1 +
 vim/.vim/lua/plugins/telescope.lua | 12 +-----------
 vim/.vimrc                         |  1 -
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 3119f1a..311b018 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -70,7 +70,6 @@
   "registers.nvim": { "branch": "main", "commit": "2ab8372bb837f05fae6b43091f10a0b725d113ca" },
   "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
   "telekasten.nvim": { "branch": "main", "commit": "584783fdbdd13bb691a435f86ed10a3717fa9e9a" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0" },
   "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" },
   "telescope_citc": { "branch": "main", "commit": "d6421d5bfe058915ece0daec55e488f8ea05f207" },
   "telescope_codesearch": { "branch": "main", "commit": "a26077ad3c68cf897ae1c31da903d6516ebb9c92" },
diff --git a/vim/.vim/lua/config/fig.lua b/vim/.vim/lua/config/fig.lua
index cca501c..7aebd86 100644
--- a/vim/.vim/lua/config/fig.lua
+++ b/vim/.vim/lua/config/fig.lua
@@ -3,7 +3,6 @@ local use_google = require("utils").use_google
 
 if use_google() then
 	map("n", "<leader>tm", ":Telescope citc modified<CR>")
-	map("n", "<leader>tb", ":Telescope file_browser<CR>")
 
 	-- [F]ig [S]tatus
 	map("n", "<leader>fs", [[<cmd>lua require('telescope').extensions.fig.status{}<CR>]])
diff --git a/vim/.vim/lua/plugins/neotree.lua b/vim/.vim/lua/plugins/neotree.lua
index 5b6989a..6215a47 100644
--- a/vim/.vim/lua/plugins/neotree.lua
+++ b/vim/.vim/lua/plugins/neotree.lua
@@ -10,6 +10,7 @@ return {
 		"nvim-lua/plenary.nvim",
 		"MunifTanjim/nui.nvim",
 	},
+	lazy = false,
 	keys = {
 		{ "<C-n>", ":Neotree filesystem reveal toggle reveal_force_cwd<cr>", desc = "Open NeoTree" },
 	},
diff --git a/vim/.vim/lua/plugins/telescope.lua b/vim/.vim/lua/plugins/telescope.lua
index 0a6e0a4..d634ebb 100644
--- a/vim/.vim/lua/plugins/telescope.lua
+++ b/vim/.vim/lua/plugins/telescope.lua
@@ -1,8 +1,5 @@
 local use_google = require("utils").use_google
 local TableConcat = require("utils").TableConcat
-local scopes = require("neoscopes")
-
-scopes.add_startup_scope()
 
 -- Helper functions to fetch the current scope and set `search_dirs`
 _G.find_files = function()
@@ -41,9 +38,7 @@ end
 
 return {
 	"nvim-telescope/telescope.nvim",
-	dependencies = {
-		"nvim-telescope/telescope-file-browser.nvim",
-	},
+	dependencies = {},
 	config = function()
 		require("telescope").setup({
 			defaults = {
@@ -80,16 +75,11 @@ return {
 			},
 			extensions = {
 				-- this block is optional, and if omitted, defaults will be used
-				file_browser = {
-					-- disables netrw and use telescope-file-browser in its place
-					hijack_netrw = false,
-				},
 				codesearch = {
 					experimental = true, -- enable results from google3/experimental
 				},
 			},
 		})
-		require("telescope").load_extension("file_browser")
 	end,
 	keys = keys,
 }
diff --git a/vim/.vimrc b/vim/.vimrc
index 298b42d..80e925b 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -134,7 +134,6 @@ let g:loaded_zipPlugin         = 1
 let g:loaded_2html_plugin      = 1
 let g:loaded_shada_plugin      = 1
 let g:loaded_spellfile_plugin  = 1
-let g:loaded_netrw             = 1
 let g:loaded_netrwPlugin       = 1
 let g:loaded_tutor_mode_plugin = 1
 let g:loaded_remote_plugins    = 1