stuff

vim/.vim/lua/plugins/base.lua

@@ -3,26 +3,19 @@ local use_google = require("utils").use_google
 return {
 	"kdheepak/lazygit.nvim",
 	"flwyd/vim-conjoin",
+	"rafcamlet/nvim-luapad",
 	"vim-scripts/vcscommand.vim",
-	"jghauser/mkdir.nvim",
 	"AndrewRadev/tagalong.vim",
+	{ "squk/gdrama-syntax.vim", ft = "gdrama" },
 	{ "nvim-lua/plenary.nvim", lazy = false },
 	{ "squk/java-syntax.vim", ft = "java" },
 	{ "udalov/kotlin-vim", event = "VeryLazy", ft = "kotlin" },
 	{ "ray-x/go.nvim", ft = "go" },
 	{ "ray-x/guihua.lua", ft = "go" },
 	{ "andymass/vim-matchup", event = "VimEnter" },
-	{ "squk/gdrama-syntax.vim", dir = vim.fn.expand("$HOME/dev/gdrama-syntax.vim") },
+	{ "jghauser/mkdir.nvim", event = "BufWritePre" },
 	{
-		"NvChad/nvim-colorizer.lua",
+		"andweeb/presence.nvim", -- session management
-		ft = "lua",
-		config = function()
-			require("colorizer").setup()
-		end,
-	},
-	{
-
-		"andweeb/presence.nvim",
 		cond = not use_google(),
 		config = function()
 			require("presence").setup({
@@ -31,14 +24,6 @@ return {
 			})
 		end,
 	},
-	{
-		"rafcamlet/nvim-luapad",
-		config = function()
-			require("luapad").setup({
-				-- eval_on_change = false,
-			})
-		end,
-	},
 	{
 		"ntpeters/vim-better-whitespace",
 		config = function()
@@ -73,4 +58,25 @@ return {
 		end,
 		ft = { "markdown" },
 	},
+	{
+		"andrewferrier/debugprint.nvim",
+		opts = {},
+		-- Dependency only needed for NeoVim 0.8
+		dependencies = {
+			"nvim-treesitter/nvim-treesitter",
+		},
+		-- Remove the following line to use development versions,
+		-- not just the formal releases
+		version = "*",
+		keys = {
+			{ "<leader>dp", ":lua require('debugprint').debugprint()<cr>", desc = "Debug print" },
+			{ "<leader>dP", ":lua require('debugprint').debugprint({above = true})<cr>", desc = "Debug print" },
+			{ "<leader>dq", ":lua require('debugprint').debugprint({variable = true})<cr>", desc = "Debug print" },
+			{
+				"<leader>dQ",
+				":lua require('debugprint').debugprint({variable = true, above = true})<cr>",
+				desc = "Debug print",
+			},
+		},
+	},
 }

vim/.vim/lua/plugins/bufferline.lua

@@ -1,15 +1,4 @@
 return {
-	{
-		"tiagovla/scope.nvim",
-		config = function()
-			-- vim.opt.sessionoptions = { -- required
-			--     "buffers",
-			--     "tabpages",
-			--     "globals",
-			-- }
-			require("scope").setup({})
-		end,
-	},
 	{
 		"akinsho/bufferline.nvim",
 		version = "*",
@@ -19,7 +8,7 @@ return {
 			require("bufferline").setup({
 				options = {
 					-- separator_style = "slope",
-					separator_style = "slant",
+					-- separator_style = "slant",
 					hover = {
 						enabled = true,
 						delay = 200,

vim/.vim/lua/plugins/debugprint.lua

@@ -1,11 +0,0 @@
-return {
-	"andrewferrier/debugprint.nvim",
-	opts = {},
-	-- Dependency only needed for NeoVim 0.8
-	dependencies = {
-		"nvim-treesitter/nvim-treesitter",
-	},
-	-- Remove the following line to use development versions,
-	-- not just the formal releases
-	version = "*",
-}

vim/.vim/lua/plugins/themes-personal.lua

@@ -11,15 +11,6 @@ return {
 			-- vim.cmd("colorscheme sonokai")
 		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
@@ -39,4 +30,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,
+	},
 }

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

zsh/.zshrc

@@ -2,6 +2,8 @@
 HISTSIZE=10000000
 SAVEHIST=10000000
 
+alias cd pushd
+
 setopt SHARE_HISTORY
 setopt HIST_REDUCE_BLANKS
 setopt HIST_FIND_NO_DUPS
@@ -24,6 +26,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