From 27955c4f97f0ddee7c6ff3398f38d6cb5a53f029 Mon Sep 17 00:00:00 2001
From: Christian Nieves <cnieves@google.com>
Date: Sat, 10 Feb 2024 22:51:15 -0600
Subject: [PATCH] stuff

---
 tmux/.tmux/plugins/tmux-continuum        |  2 +-
 vim/.vim/lua/plugins/themes-personal.lua | 34 +++++++++++++++++-------
 zsh/.bash_profile                        |  1 +
 zsh/.zshrc                               |  1 +
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/tmux/.tmux/plugins/tmux-continuum b/tmux/.tmux/plugins/tmux-continuum
index 0698e8f..3e4bc35 160000
--- a/tmux/.tmux/plugins/tmux-continuum
+++ b/tmux/.tmux/plugins/tmux-continuum
@@ -1 +1 @@
-Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0
+Subproject commit 3e4bc35da41f956c873aea716c97555bf1afce5d
diff --git a/vim/.vim/lua/plugins/themes-personal.lua b/vim/.vim/lua/plugins/themes-personal.lua
index d7f738b..7b3ca38 100644
--- a/vim/.vim/lua/plugins/themes-personal.lua
+++ b/vim/.vim/lua/plugins/themes-personal.lua
@@ -12,16 +12,6 @@ return {
 		end,
 	},
 	{
-		"rebelot/kanagawa.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(),
-		config = function()
-			-- vim.cmd("colorscheme kanagawa-wave")
-		end,
-	},
-	{
-		"nyoom-engineering/oxocarbon.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 = false,
@@ -39,4 +29,28 @@ return {
 			vim.cmd("colorscheme bluloco")
 		end,
 	},
+	{
+		"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(),
+		config = function()
+			-- vim.cmd("colorscheme nightfox")
+			-- vim.cmd("colorscheme carbonfox")
+			-- vim.cmd("colorscheme terafox")
+			vim.cmd("colorscheme duskfox")
+			-- vim.cmd("colorscheme nordfox")
+			-- vim.cmd("colorscheme dayfox")
+			-- vim.cmd("colorscheme dawnfox")
+		end,
+	},
+	{
+		"rebelot/kanagawa.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 = false,
+		config = function()
+			vim.cmd("colorscheme kanagawa-wave")
+		end,
+	},
 }
diff --git a/zsh/.bash_profile b/zsh/.bash_profile
index b13ca4b..0e069d5 100644
--- a/zsh/.bash_profile
+++ b/zsh/.bash_profile
@@ -33,3 +33,4 @@ export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
 
+if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
diff --git a/zsh/.zshrc b/zsh/.zshrc
index e50d256..ba8fef3 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -24,6 +24,7 @@ zplug "plugins/docker-compose",   from:oh-my-zsh;
 zplug "plugins/docker",   from:oh-my-zsh;
 zplug "plugins/rsync",   from:oh-my-zsh;
 zplug "plugins/safepaste",   from:oh-my-zsh;
+zplug "mattberther/zsh-pyenv"
 
 zplug "Tarrasch/zsh-autoenv" # Expects .autoenv.zsh or .autoenv_leave.zsh
 zplug "zsh-users/zsh-syntax-highlighting", defer:2