From f9acecd55879840eb5a5f293ad82c69839128179 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Fri, 5 Jul 2024 21:09:38 +0000
Subject: [PATCH] Neotree fig

---
 tmux/.tmux/plugins/tmux-continuum        |  2 +-
 vim/.vim/lua/plugins/neotree.lua         | 18 +++++++++++++++---
 vim/.vim/lua/plugins/themes-personal.lua | 12 +++++++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/tmux/.tmux/plugins/tmux-continuum b/tmux/.tmux/plugins/tmux-continuum
index 3e4bc35..0698e8f 160000
--- a/tmux/.tmux/plugins/tmux-continuum
+++ b/tmux/.tmux/plugins/tmux-continuum
@@ -1 +1 @@
-Subproject commit 3e4bc35da41f956c873aea716c97555bf1afce5d
+Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0
diff --git a/vim/.vim/lua/plugins/neotree.lua b/vim/.vim/lua/plugins/neotree.lua
index f860a95..b8b5f31 100644
--- a/vim/.vim/lua/plugins/neotree.lua
+++ b/vim/.vim/lua/plugins/neotree.lua
@@ -1,11 +1,17 @@
+local use_google = require("utils").use_google
+
 return {
 	{
 		"nvim-neo-tree/neo-tree.nvim",
+		deps = {
+			"~/fig-tree",
+		},
 		cmd = {
 			"Neotree",
 		},
 		config = function()
 			require("neo-tree").setup({
+				hijack_netrw_behavior = "open_default",
 				filesystem = {
 					filtered_items = {
 						hide_dotfiles = false,
@@ -17,7 +23,7 @@ return {
 					"buffers",
 					"git_status",
 					"diagnostics",
-					"docment_symbols",
+					"fig",
 					-- ...and any additional source
 				},
 				source_selector = {
@@ -66,9 +72,15 @@ return {
 			"MunifTanjim/nui.nvim",
 		},
 		keys = {
-			{ "<C-n>", ":Neotree float reveal toggle dir=%:p:h<cr>" },
+			(function()
+				if use_google() then
+					return { "<C-n>", ":Neotree toggle fig<CR>", desc = "Open NeoTree CWD float" }
+				end
+				-- return { "<C-n>.", ":Neotree toggle reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" }
+				return { "<C-n>", ":Neotree toggle git_status<CR>", desc = "Open NeoTree CWD float" }
+			end)(),
 			{ "<C-n>b", ":Neotree float buffers<CR>" },
-			-- { "<C-n>.", ":Neotree float reveal_force_cwd<CR>", desc = "Open NeoTree CWD float" },
+			{ "<C-n>.", ":Neotree float reveal toggle dir=%:p:h<cr>" },
 		},
 	},
 }
diff --git a/vim/.vim/lua/plugins/themes-personal.lua b/vim/.vim/lua/plugins/themes-personal.lua
index c0ff015..1ce5f99 100644
--- a/vim/.vim/lua/plugins/themes-personal.lua
+++ b/vim/.vim/lua/plugins/themes-personal.lua
@@ -1,6 +1,16 @@
 local use_google = require("utils").use_google
 
 return {
+	{
+		"bluz71/vim-moonfly-colors",
+		name = "moonfly",
+		cond = not use_google(),
+		lazy = false,
+		priority = 1000,
+		config = function()
+			vim.cmd("colorscheme moonfly")
+		end,
+	},
 	{
 		"sainnhe/sonokai",
 		-- cond = false,
@@ -34,7 +44,7 @@ return {
 		"EdenEast/nightfox.nvim",
 		lazy = use_google(), -- 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
-		cond = not use_google(),
+		cond = false,
 		config = function()
 			-- vim.cmd("colorscheme nightfox")
 			-- vim.cmd("colorscheme carbonfox")