feat: updated plugins; oil.nvim + other things

14 files changed, 409 insertions, 173 deletions

diff --git a/.config/.workloggerconfig.json b/.config/.workloggerconfig.json
index 57601c7..d3f7a55 100644
--- a/.config/.workloggerconfig.json
+++ b/.config/.workloggerconfig.json
@@ -57,6 +57,15 @@
                     "Logging": "Configuring Logging Threading"
                 }
             ]
+        },
+        {
+            "name": "BTYTechnology",
+            "projects": [
+                {
+                    "Website": "Building the company website",
+                    "BPs": "Logging the business processes for repackaging",
+                }
+            ]
         }
     ]
 }
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index f94783d..e5c4114 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -4,16 +4,13 @@ require("wacky.core.keymaps")
 require("wacky.core.colorscheme")
 require("wacky.plugins.transparent")
 require("wacky.plugins.comment")
-require("wacky.plugins.nvim-tree")
+require("wacky.plugins.nvim-oil")
 require("wacky.plugins.lualine")
 require("wacky.plugins.telescope")
 require("wacky.plugins.nvim-cmp")
 require("wacky.plugins.lsp.mason")
-require("wacky.plugins.lsp.lspsaga")
 require("wacky.plugins.lsp.lspconfig")
 require("wacky.plugins.autopairs")
-require("wacky.plugins.treesitter")
-require("wacky.plugins.gitsigns")
 require("wacky.plugins.formatter")
 require("wacky.plugins.vimtex-setup")
 require("wacky.plugins.linter-setup")
diff --git a/.config/nvim/lua/wacky/core/colorscheme.lua b/.config/nvim/lua/wacky/core/colorscheme.lua
index fe5cce2..c330433 100644
--- a/.config/nvim/lua/wacky/core/colorscheme.lua
+++ b/.config/nvim/lua/wacky/core/colorscheme.lua
@@ -1,11 +1,42 @@
-vim.cmd("set background=light")
-vim.cmd("colorscheme zenburned")
-vim.g.zenbones = {
-	transparent_background = true,
-	lightness = "bright",
-	darkness = "stark",
-}
+require("kanso").setup({
+	compile = false, -- enable compiling the colorscheme
+	undercurl = true, -- enable undercurls
+	commentStyle = { italic = true },
+	functionStyle = {},
+	keywordStyle = { italic = true },
+	statementStyle = {},
+	typeStyle = {},
+	disableItalics = false,
+	transparent = true, -- do not set background color
+	dimInactive = false, -- dim inactive window `:h hl-NormalNC`
+	terminalColors = false, -- define vim.g.terminal_color_{0,17}
+	colors = { -- add/modify theme and palette colors
+		palette = {},
+		theme = { zen = {}, pearl = {}, ink = {}, all = {} },
+	},
+	overrides = function(colors) -- add/modify highlights
+		return {}
+	end,
+	theme = "zen", -- Load "zen" theme
+	background = { -- map the value of 'background' option to a theme
+		dark = "zen", -- try "ink" !
+		light = "pearl",
+	},
+})
 
+-- setup must be called before loading
+vim.cmd("colorscheme kanso")
+
+-- This is for the Zenbone Theme
+-- vim.cmd("set background=light")
+-- vim.cmd("colorscheme zenburned")
+-- vim.g.zenbones = {
+-- 	transparent_background = true,
+-- 	lightness = "bright",
+-- 	darkness = "stark",
+-- }
+
+-- This is for the Bluloco Theme
 --require("bluloco").setup({
 --	style = "light", -- "auto" | "dark" | "light"
 --	transparent = true,
@@ -14,6 +45,7 @@ vim.g.zenbones = {
 --	guicursor = true,
 --})
 
+-- This is for the tokyonight Theme; one of my favorites
 -- require("tokyonight").setup({
 -- 	-- your configuration comes here
 -- 	-- or leave it empty to use the default settings
diff --git a/.config/nvim/lua/wacky/core/keymaps.lua b/.config/nvim/lua/wacky/core/keymaps.lua
index 5940a49..529a284 100644
--- a/.config/nvim/lua/wacky/core/keymaps.lua
+++ b/.config/nvim/lua/wacky/core/keymaps.lua
@@ -48,8 +48,11 @@ keymap.set("n", "<leader>tp", ":tabp<CR>") --  go to previous tab
 -- vim-maximizer
 keymap.set("n", "<leader>sm", ":MaximizerToggle<CR>") -- toggle split window maximization
 
--- nvim-tree
-keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>") -- toggle file explorer
+-- oil.nvim
+keymap.set("n", "<leader>e", ":Oil --float<CR>") -- toggle file explorer
+keymap.set("n", "<leader>e", function()
+	require("Oil").toggle_float()
+end) -- toggle file explorer
 
 -- telescope
 keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>") -- find files within current working directory, respects .gitignore
diff --git a/.config/nvim/lua/wacky/plugins-setup.lua b/.config/nvim/lua/wacky/plugins-setup.lua
index d2cecae..959627f 100644
--- a/.config/nvim/lua/wacky/plugins-setup.lua
+++ b/.config/nvim/lua/wacky/plugins-setup.lua
@@ -37,24 +37,21 @@ return packer.startup(function(use)
 	use("xiyaowong/transparent.nvim")
 
 	-- Color Scheme is here!!!
-	use({ "zenbones-theme/zenbones.nvim", requires = { "rktjmp/lush.nvim" } }) -- preferred colorscheme atm
-
-	use("christoomey/vim-tmux-navigator") -- tmux & split window navigation
+	use("webhooked/kanso.nvim") -- preferred colorscheme atm
 
 	use("szw/vim-maximizer") -- maximizes and restores current window
 
-	-- essential plugins
 	use("tpope/vim-surround") -- add, delete, change surroundings (it's awesome)
 	use("inkarkat/vim-ReplaceWithRegister") -- replace with register contents using motion (gr + motion)
 
-	-- commenting with gc
-	use("numToStr/Comment.nvim")
-
 	-- file explorer
-	use("nvim-tree/nvim-tree.lua")
-
-	-- vs-code like icons
-	use("nvim-tree/nvim-web-devicons")
+	use({ "stevearc/oil.nvim" })
+	-- extension(s) to oil
+	use({
+		"JezerM/oil-lsp-diagnostics.nvim",
+		"nvim-tree/nvim-web-devicons", -- actually important
+		requires = { "stevearc/oil.nvim" },
+	})
 
 	-- statusline
 	use("nvim-lualine/lualine.nvim")
@@ -85,13 +82,24 @@ return packer.startup(function(use)
 	use("neovim/nvim-lspconfig") -- easily configure language servers
 	use("hrsh7th/cmp-nvim-lsp") -- for autocompletion
 	use({
-		"glepnir/lspsaga.nvim",
-		branch = "main",
-		requires = {
-			{ "nvim-tree/nvim-web-devicons" },
-			{ "nvim-treesitter/nvim-treesitter" },
-		},
-	}) -- enhanced lsp uis
+		"nvimdev/lspsaga.nvim",
+		after = "nvim-lspconfig",
+		config = function()
+			require("lspsaga").setup({
+				-- keybinds for navigation in lspsaga window
+				scroll_preview = { scroll_down = "<C-f>", scroll_up = "<C-b>" },
+				-- use enter to open file with definition preview
+				definition = {
+					edit = "<CR>",
+				},
+				ui = {
+					colors = {
+						normal_bg = "#022746",
+					},
+				},
+			})
+		end,
+	})
 
 	-- vs-code like icons for autocompletion
 	use("onsails/lspkind.nvim")
@@ -109,22 +117,6 @@ return packer.startup(function(use)
 	use({
 		"kristijanhusak/vim-dadbod-ui",
 		requires = { "tpope/vim-dadbod" },
-		dependencies = {
-			{
-				"kristijanhusak/vim-dadbod-completion",
-				ft = { "sql" },
-				cmd = {
-					"DBUI",
-					"DBUIToggle",
-					"DBUIAddConnection",
-					"DBUIFindBuffer",
-				},
-				config = function()
-					-- place my small config changes here
-					vim.g.db_ui_use_nerd_fonts = 1
-				end,
-			},
-		},
 	})
 
 	-- auto closing
diff --git a/.config/nvim/lua/wacky/plugins/lsp/lspconfig.lua b/.config/nvim/lua/wacky/plugins/lsp/lspconfig.lua
index 9605cb5..376214f 100644
--- a/.config/nvim/lua/wacky/plugins/lsp/lspconfig.lua
+++ b/.config/nvim/lua/wacky/plugins/lsp/lspconfig.lua
@@ -1,79 +1,47 @@
--- import lspconfig plugin safely
-local lspconfig_status, lspconfig = pcall(require, "lspconfig")
-if not lspconfig_status then
-	return
-end
-
 -- import cmp-nvim-lsp plugin safely
 local cmp_nvim_lsp_status, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
 if not cmp_nvim_lsp_status then
 	return
 end
 
-local keymap = vim.keymap -- for conciseness
+-- for sameness
+local lspconfig = vim.lsp
+local keymap = vim.keymap
 
 -- enable keybinds only for when lsp server available
 local on_attach = function(client, bufnr)
-	-- keybind options
 	local opts = { noremap = true, silent = true, buffer = bufnr }
-
-	-- set keybinds
-	keymap.set("n", "gf", "<cmd>Lspsaga lsp_finder<CR>", opts) -- show definition, references
-	keymap.set("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts) -- go to declaration
-	keymap.set("n", "gd", "<cmd>Lspsaga peek_definition<CR>", opts) -- see definition and make edits in window
-	keymap.set("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts) -- go to implementation
-	keymap.set("n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts) -- see variable in hover
-	keymap.set("n", "<leader>ca", "<cmd>Lspsaga code_action<CR>", opts) -- see available code actions
-	keymap.set("n", "<leader>rn", "<cmd>Lspsaga rename<CR>", opts) -- smart rename
-	keymap.set("n", "<leader>D", "<cmd>Lspsaga show_line_diagnostics<CR>", opts) -- show  diagnostics for line
-	keymap.set("n", "<leader>d", "<cmd>Lspsaga show_cursor_diagnostics<CR>", opts) -- show diagnostics for cursor
-	keymap.set("n", "[d", "<cmd>Lspsaga diagnostic_jump_prev<CR>", opts) -- jump to previous diagnostic in buffer
-	keymap.set("n", "]d", "<cmd>Lspsaga diagnostic_jump_next<CR>", opts) -- jump to next diagnostic in buffer
-	keymap.set("n", "K", "<cmd>Lspsaga hover_doc<CR>", opts) -- show documentation for what is under cursor
-	keymap.set("n", "<leader>o", "<cmd>LSoutlineToggle<CR>", opts) -- see outline on right hand side
+	keymap.set("n", "<leader>f", "<cmd>Lspsaga finder<CR>", opts)
+	keymap.set("n", "gf", "<cmd>Lspsaga lsp_finder<CR>", opts)
+	keymap.set("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", opts)
+	keymap.set("n", "gd", "<cmd>Lspsaga peek_definition<CR>", opts)
+	keymap.set("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
+	keymap.set("n", "K", "<cmd>Lspsaga hover_doc<CR>", opts)
+	keymap.set("n", "[d", "<cmd>Lspsaga diagnostic_jump_prev<CR>", opts)
+	keymap.set("n", "]d", "<cmd>Lspsaga diagnostic_jump_next<CR>", opts)
+	keymap.set("n", "<leader>o", "<cmd>LSoutlineToggle<CR>", opts)
 end
 
--- used to enable autocompletion (assign to every lsp server config)
 local capabilities = cmp_nvim_lsp.default_capabilities()
 
--- Change the Diagnostic symbols in the sign column (gutter)
--- (not in youtube nvim video)
 local signs = { Error = " ", Warn = " ", Hint = "ﴞ ", Info = " " }
 for type, icon in pairs(signs) do
 	local hl = "DiagnosticSign" .. type
 	vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
 end
 
-local servers = {
-	"clangd",
-	"arduino_language_server",
-	"ltex",
-	"jedi_language_server",
-	"ts_ls",
-	"tailwindcss",
-	"metals",
-	"htmx",
-}
-
-for _, lsp in pairs(servers) do
-	require("lspconfig")[lsp].setup({
-		capabilities = capabilities,
-		on_attach = on_attach,
-	})
-end
-
--- configure metals server with defaults
-lspconfig["metals"].setup({})
+vim.api.nvim_set_hl(0, "DiagnosticSignError", { fg = "#FF0000" })
+vim.api.nvim_set_hl(0, "DiagnosticSignWarn", { fg = "#FFA500" })
+vim.api.nvim_set_hl(0, "DiagnosticSignHint", { fg = "#00FFFF" })
+vim.api.nvim_set_hl(0, "DiagnosticSignInfo", { fg = "#00FF00" })
 
--- configure html server to attach on typescriptreact, javascriptreact
-lspconfig["html"].setup({
+lspconfig.config("html", {
 	filetypes = { "html", "typescriptreact", "javascriptreact" },
-	capabilities = capabilities,
 	on_attach = on_attach,
+	capabilities = capabilities,
 })
 
--- configure go server; additional settings
-lspconfig["gopls"].setup({
+lspconfig.config("gopls", {
 	settings = {
 		gopls = {
 			analyses = {
@@ -83,25 +51,68 @@ lspconfig["gopls"].setup({
 			gofumpt = true,
 		},
 	},
+	on_attach = on_attach,
+	capabilities = capabilities,
 })
 
--- configure lua server (with special settings)
-lspconfig["lua_ls"].setup({
-	capabilities = capabilities,
-	on_attach = on_attach,
-	settings = { -- custom settings for lua
+lspconfig.config("lua_ls", {
+	cmd = { "lua-language-server", "--force-accept-workspace" },
+	filetypes = { "lua" },
+	root_markers = { ".luarc.json", ".luarc.jsonc" },
+	settings = {
 		Lua = {
-			-- make the language server recognize "vim" global
+			runtime = {
+				version = "LuaJIT",
+			},
 			diagnostics = {
 				globals = { "vim" },
 			},
-			workspace = {
-				-- make language server aware of runtime files
-				library = {
-					[vim.fn.expand("$VIMRUNTIME/lua")] = true,
-					[vim.fn.stdpath("config") .. "/lua"] = true,
-				},
-			},
+			--workspace = {
+			--	library = {
+			--		-- [vim.fn.expand("$VIMRUNTIME/lua")] = true,
+			--		-- [vim.fn.stdpath("config") .. "/lua"] = true,
+			--	},
+			--},
 		},
 	},
+	on_attach = on_attach,
+	capabilities = capabilities,
 })
+
+-- Configure other servers with default settings
+local servers = {
+	"clangd",
+	"arduino_language_server",
+	"ltex",
+	"jedi_language_server",
+	"ts_ls",
+	"tailwindcss",
+	"metals",
+	"htmx",
+}
+
+for _, server in pairs(servers) do
+	lspconfig.config(server, {
+		on_attach = on_attach,
+		capabilities = capabilities,
+	})
+end
+
+-- Enable all configured servers
+local all_servers = {
+	"clangd",
+	"arduino_language_server",
+	"ltex",
+	"jedi_language_server",
+	"ts_ls",
+	"tailwindcss",
+	"metals",
+	"htmx",
+	"html",
+	"gopls",
+	"lua_ls",
+}
+
+for _, server in pairs(all_servers) do
+	lspconfig.enable(server)
+end
diff --git a/.config/nvim/lua/wacky/plugins/lsp/lspsaga.lua b/.config/nvim/lua/wacky/plugins/lsp/lspsaga.lua
deleted file mode 100644
index 90f5d57..0000000
--- a/.config/nvim/lua/wacky/plugins/lsp/lspsaga.lua
+++ /dev/null
@@ -1,19 +0,0 @@
--- import lspsaga safely
-local saga_status, saga = pcall(require, "lspsaga")
-if not saga_status then
-  return
-end
-
-saga.setup({
-  -- keybinds for navigation in lspsaga window
-  scroll_preview = { scroll_down = "<C-f>", scroll_up = "<C-b>" },
-  -- use enter to open file with definition preview
-  definition = {
-    edit = "<CR>",
-  },
-  ui = {
-    colors = {
-      normal_bg = "#022746",
-    },
-  },
-})
diff --git a/.config/nvim/lua/wacky/plugins/nvim-cmp.lua b/.config/nvim/lua/wacky/plugins/nvim-cmp.lua
index 7fff7a6..dc9e0a8 100644
--- a/.config/nvim/lua/wacky/plugins/nvim-cmp.lua
+++ b/.config/nvim/lua/wacky/plugins/nvim-cmp.lua
@@ -1,6 +1,6 @@
 local cmp_status, cmp = pcall(require, "cmp")
 if not cmp_status then
-    print("cmp failed...")
+	print("cmp failed...")
 	return
 end
 
@@ -54,9 +54,9 @@ cmp.setup({
 })
 
 -- setup for vim-dadbod
-cmp.setup.filetype({ "sql" }, {
-	sources = {
-		{ name = "vim-dadbod-completion" },
-		{ name = "buffer" },
-	},
-})
+--cmp.setup.filetype({ "sql" }, {
+--	sources = {
+--		{ name = "vim-dadbod-completion" },
+--		{ name = "buffer" },
+--	},
+--})
diff --git a/.config/nvim/lua/wacky/plugins/nvim-oil.lua b/.config/nvim/lua/wacky/plugins/nvim-oil.lua
new file mode 100644
index 0000000..14dccc2
--- /dev/null
+++ b/.config/nvim/lua/wacky/plugins/nvim-oil.lua
@@ -0,0 +1,208 @@
+local setup, oil = pcall(require, "oil")
+if not setup then
+	print("oil.nvim failed...")
+	return
+end
+
+oil.setup({
+	-- Oil will take over directory buffers (e.g. `vim .` or `:e src/`)
+	-- Set to false if you want some other plugin (e.g. netrw) to open when you edit directories.
+	default_file_explorer = true,
+	-- Id is automatically added at the beginning, and name at the end
+	-- See :help oil-columns
+	columns = {
+		"icon",
+		"permissions",
+		"size",
+		"mtime",
+	},
+	-- Buffer-local options to use for oil buffers
+	buf_options = {
+		buflisted = false,
+		bufhidden = "hide",
+	},
+	-- Window-local options to use for oil buffers
+	win_options = {
+		wrap = false,
+		signcolumn = "no",
+		cursorcolumn = false,
+		foldcolumn = "0",
+		spell = false,
+		list = false,
+		conceallevel = 3,
+		concealcursor = "nvic",
+	},
+	-- Send deleted files to the trash instead of permanently deleting them (:help oil-trash)
+	delete_to_trash = false,
+	-- Skip the confirmation popup for simple operations (:help oil.skip_confirm_for_simple_edits)
+	skip_confirm_for_simple_edits = false,
+	-- Selecting a new/moved/renamed file or directory will prompt you to save changes first
+	-- (:help prompt_save_on_select_new_entry)
+	prompt_save_on_select_new_entry = true,
+	-- Oil will automatically delete hidden buffers after this delay
+	-- You can set the delay to false to disable cleanup entirely
+	-- Note that the cleanup process only starts when none of the oil buffers are currently displayed
+	cleanup_delay_ms = 2000,
+	lsp_file_methods = {
+		-- Enable or disable LSP file operations
+		enabled = true,
+		-- Time to wait for LSP file operations to complete before skipping
+		timeout_ms = 1000,
+		-- Set to true to autosave buffers that are updated with LSP willRenameFiles
+		-- Set to "unmodified" to only save unmodified buffers
+		autosave_changes = false,
+	},
+	-- Constrain the cursor to the editable parts of the oil buffer
+	-- Set to `false` to disable, or "name" to keep it on the file names
+	constrain_cursor = "editable",
+	-- Set to true to watch the filesystem for changes and reload oil
+	watch_for_changes = false,
+	-- Keymaps in oil buffer. Can be any value that `vim.keymap.set` accepts OR a table of keymap
+	-- options with a `callback` (e.g. { callback = function() ... end, desc = "", mode = "n" })
+	-- Additionally, if it is a string that matches "actions.<name>",
+	-- it will use the mapping at require("oil.actions").<name>
+	-- Set to `false` to remove a keymap
+	-- See :help oil-actions for a list of all available actions
+	keymaps = {
+		["g?"] = { "actions.show_help", mode = "n" },
+		["<CR>"] = "actions.select",
+		["<C-s>"] = { "actions.select", opts = { vertical = true } },
+		["<C-h>"] = { "actions.select", opts = { horizontal = true } },
+		["<C-t>"] = { "actions.select", opts = { tab = true } },
+		["<C-p>"] = "actions.preview",
+		["<C-c>"] = { "actions.close", mode = "n" },
+		["<C-l>"] = "actions.refresh",
+		["-"] = { "actions.parent", mode = "n" },
+		["_"] = { "actions.open_cwd", mode = "n" },
+		["`"] = { "actions.cd", mode = "n" },
+		["~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" },
+		["gs"] = { "actions.change_sort", mode = "n" },
+		["gx"] = "actions.open_external",
+		["g."] = { "actions.toggle_hidden", mode = "n" },
+		["g\\"] = { "actions.toggle_trash", mode = "n" },
+	},
+	-- Set to false to disable all of the above keymaps
+	use_default_keymaps = true,
+	view_options = {
+		-- Show files and directories that start with "."
+		show_hidden = false,
+		-- This function defines what is considered a "hidden" file
+		is_hidden_file = function(name, bufnr)
+			local m = name:match("^%.")
+			return m ~= nil
+		end,
+		-- This function defines what will never be shown, even when `show_hidden` is set
+		is_always_hidden = function(name, bufnr)
+			return false
+		end,
+		-- Sort file names with numbers in a more intuitive order for humans.
+		-- Can be "fast", true, or false. "fast" will turn it off for large directories.
+		natural_order = "fast",
+		-- Sort file and directory names case insensitive
+		case_insensitive = false,
+		sort = {
+			-- sort order can be "asc" or "desc"
+			-- see :help oil-columns to see which columns are sortable
+			{ "type", "asc" },
+			{ "name", "asc" },
+		},
+		-- Customize the highlight group for the file name
+		highlight_filename = function(entry, is_hidden, is_link_target, is_link_orphan)
+			return nil
+		end,
+	},
+	-- Extra arguments to pass to SCP when moving/copying files over SSH
+	extra_scp_args = {},
+	-- EXPERIMENTAL support for performing file operations with git
+	git = {
+		-- Return true to automatically git add/mv/rm files
+		add = function(path)
+			return false
+		end,
+		mv = function(src_path, dest_path)
+			return false
+		end,
+		rm = function(path)
+			return false
+		end,
+	},
+	-- Configuration for the floating window in oil.open_float
+	float = {
+		-- Padding around the floating window
+		padding = 2,
+		-- max_width and max_height can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)
+		max_width = 0,
+		max_height = 0,
+		border = "rounded",
+		win_options = {
+			winblend = 0,
+		},
+		-- optionally override the oil buffers window title with custom function: fun(winid: integer): string
+		get_win_title = nil,
+		-- preview_split: Split direction: "auto", "left", "right", "above", "below".
+		preview_split = "auto",
+		-- This is the config that will be passed to nvim_open_win.
+		-- Change values here to customize the layout
+		override = function(conf)
+			return conf
+		end,
+	},
+	-- Configuration for the file preview window
+	preview_win = {
+		-- Whether the preview window is automatically updated when the cursor is moved
+		update_on_cursor_moved = true,
+		-- How to open the preview window "load"|"scratch"|"fast_scratch"
+		preview_method = "fast_scratch",
+		-- A function that returns true to disable preview on a file e.g. to avoid lag
+		disable_preview = function(filename)
+			return false
+		end,
+		-- Window-local options to use for preview window buffers
+		win_options = {},
+	},
+	-- Configuration for the floating action confirmation window
+	confirmation = {
+		-- Width dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)
+		-- min_width and max_width can be a single value or a list of mixed integer/float types.
+		-- max_width = {100, 0.8} means "the lesser of 100 columns or 80% of total"
+		max_width = 0.9,
+		-- min_width = {40, 0.4} means "the greater of 40 columns or 40% of total"
+		min_width = { 40, 0.4 },
+		-- optionally define an integer/float for the exact width of the preview window
+		width = nil,
+		-- Height dimensions can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)
+		-- min_height and max_height can be a single value or a list of mixed integer/float types.
+		-- max_height = {80, 0.9} means "the lesser of 80 columns or 90% of total"
+		max_height = 0.9,
+		-- min_height = {5, 0.1} means "the greater of 5 columns or 10% of total"
+		min_height = { 5, 0.1 },
+		-- optionally define an integer/float for the exact height of the preview window
+		height = nil,
+		border = "rounded",
+		win_options = {
+			winblend = 0,
+		},
+	},
+	-- Configuration for the floating progress window
+	progress = {
+		max_width = 0.9,
+		min_width = { 40, 0.4 },
+		width = nil,
+		max_height = { 10, 0.9 },
+		min_height = { 5, 0.1 },
+		height = nil,
+		border = "rounded",
+		minimized_border = "none",
+		win_options = {
+			winblend = 0,
+		},
+	},
+	-- Configuration for the floating SSH window
+	ssh = {
+		border = "rounded",
+	},
+	-- Configuration for the floating keymaps help window
+	keymaps_help = {
+		border = "rounded",
+	},
+})
diff --git a/.config/nvim/lua/wacky/plugins/nvim-tree.lua b/.config/nvim/lua/wacky/plugins/nvim-tree.lua
index 757be62..a7d7585 100644
--- a/.config/nvim/lua/wacky/plugins/nvim-tree.lua
+++ b/.config/nvim/lua/wacky/plugins/nvim-tree.lua
@@ -1,6 +1,6 @@
 local setup, nvimtree = pcall(require, "nvim-tree")
 if not setup then
-    print("nvimtree failed...")
+	print("nvimtree failed...")
 	return
 end
 
diff --git a/.config/nvim/lua/wacky/plugins/treesitter.lua b/.config/nvim/lua/wacky/plugins/treesitter.lua
index 320d375..4d6163c 100644
--- a/.config/nvim/lua/wacky/plugins/treesitter.lua
+++ b/.config/nvim/lua/wacky/plugins/treesitter.lua
@@ -1,5 +1,5 @@
 -- import nvim-treesitter plugin safely
-local status, treesitter = pcall(require, "nvim-treesitter.configs")
+local status, treesitter = pcall(require, "nvim-ts-autotag")
 if not status then
 	return
 end
diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua
index 143b0f0..6936cbe 100644
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
 end
 
 time([[Luarocks path setup]], true)
-local package_path_str = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/share/lua/5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/share/lua/5.1/?/init.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/lib/luarocks/rocks-5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1734355927/lib/lua/5.1/?.so"
+local package_path_str = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1748459687/share/lua/5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1748459687/share/lua/5.1/?/init.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1748459687/lib/luarocks/rocks-5.1/?.lua;/Users/cole/.cache/nvim/packer_hererocks/2.1.1748459687/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/Users/cole/.cache/nvim/packer_hererocks/2.1.1748459687/lib/lua/5.1/?.so"
 if not string.find(package.path, package_path_str, 1, true) then
   package.path = package.path .. ';' .. package_path_str
 end
@@ -74,11 +74,6 @@ end
 time([[try_loadstring definition]], false)
 time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
-  ["Comment.nvim"] = {
-    loaded = true,
-    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/Comment.nvim",
-    url = "https://github.com/numToStr/Comment.nvim"
-  },
   LuaSnip = {
     loaded = true,
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/LuaSnip",
@@ -119,26 +114,29 @@ _G.packer_plugins = {
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
     url = "https://github.com/lewis6991/gitsigns.nvim"
   },
+  ["kanso.nvim"] = {
+    loaded = true,
+    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/kanso.nvim",
+    url = "https://github.com/webhooked/kanso.nvim"
+  },
   ["lspkind.nvim"] = {
     loaded = true,
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/lspkind.nvim",
     url = "https://github.com/onsails/lspkind.nvim"
   },
   ["lspsaga.nvim"] = {
+    config = { "\27LJ\2\n�\1\0\0\5\0\f\0\0156\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\0025\3\6\0=\3\a\0025\3\t\0005\4\b\0=\4\n\3=\3\v\2B\0\2\1K\0\1\0\aui\vcolors\1\0\1\vcolors\0\1\0\1\14normal_bg\f#022746\15definition\1\0\1\tedit\t<CR>\19scroll_preview\1\0\3\19scroll_preview\0\aui\0\15definition\0\1\0\2\14scroll_up\n<C-b>\16scroll_down\n<C-f>\nsetup\flspsaga\frequire\0" },
+    load_after = {},
     loaded = true,
-    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
-    url = "https://github.com/glepnir/lspsaga.nvim"
+    needs_bufread = false,
+    path = "/Users/cole/.local/share/nvim/site/pack/packer/opt/lspsaga.nvim",
+    url = "https://github.com/nvimdev/lspsaga.nvim"
   },
   ["lualine.nvim"] = {
     loaded = true,
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/lualine.nvim",
     url = "https://github.com/nvim-lualine/lualine.nvim"
   },
-  ["lush.nvim"] = {
-    loaded = true,
-    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/lush.nvim",
-    url = "https://github.com/rktjmp/lush.nvim"
-  },
   ["markdown-preview.nvim"] = {
     loaded = false,
     needs_bufread = false,
@@ -191,11 +189,6 @@ _G.packer_plugins = {
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/nvim-nio",
     url = "https://github.com/nvim-neotest/nvim-nio"
   },
-  ["nvim-tree.lua"] = {
-    loaded = true,
-    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
-    url = "https://github.com/nvim-tree/nvim-tree.lua"
-  },
   ["nvim-treesitter"] = {
     loaded = true,
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
@@ -212,6 +205,16 @@ _G.packer_plugins = {
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
     url = "https://github.com/nvim-tree/nvim-web-devicons"
   },
+  ["oil-lsp-diagnostics.nvim"] = {
+    loaded = true,
+    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/oil-lsp-diagnostics.nvim",
+    url = "https://github.com/JezerM/oil-lsp-diagnostics.nvim"
+  },
+  ["oil.nvim"] = {
+    loaded = true,
+    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/oil.nvim",
+    url = "https://github.com/stevearc/oil.nvim"
+  },
   ["packer.nvim"] = {
     loaded = true,
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/packer.nvim",
@@ -233,7 +236,7 @@ _G.packer_plugins = {
     url = "https://github.com/nvim-telescope/telescope.nvim"
   },
   ["toggleterm.nvim"] = {
-    config = { "\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\tsize\3\15\14autochdir\1\14direction\15horizontal\nsetup\15toggleterm\frequire\0" },
+    config = { "\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\14direction\15horizontal\14autochdir\1\tsize\3\15\nsetup\15toggleterm\frequire\0" },
     loaded = true,
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/toggleterm.nvim",
     url = "https://github.com/akinsho/toggleterm.nvim"
@@ -268,20 +271,10 @@ _G.packer_plugins = {
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/vim-surround",
     url = "https://github.com/tpope/vim-surround"
   },
-  ["vim-tmux-navigator"] = {
-    loaded = true,
-    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/vim-tmux-navigator",
-    url = "https://github.com/christoomey/vim-tmux-navigator"
-  },
   vimtex = {
     loaded = true,
     path = "/Users/cole/.local/share/nvim/site/pack/packer/start/vimtex",
     url = "https://github.com/lervag/vimtex"
-  },
-  ["zenbones.nvim"] = {
-    loaded = true,
-    path = "/Users/cole/.local/share/nvim/site/pack/packer/start/zenbones.nvim",
-    url = "https://github.com/zenbones-theme/zenbones.nvim"
   }
 }
 
@@ -290,14 +283,23 @@ time([[Defining packer_plugins]], false)
 time([[Setup for markdown-preview.nvim]], true)
 try_loadstring("\27LJ\2\n=\0\0\2\0\4\0\0056\0\0\0009\0\1\0005\1\3\0=\1\2\0K\0\1\0\1\2\0\0\rmarkdown\19mkdp_filetypes\6g\bvim\0", "setup", "markdown-preview.nvim")
 time([[Setup for markdown-preview.nvim]], false)
+-- Config for: toggleterm.nvim
+time([[Config for toggleterm.nvim]], true)
+try_loadstring("\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\14direction\15horizontal\14autochdir\1\tsize\3\15\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim")
+time([[Config for toggleterm.nvim]], false)
 -- Config for: nvim-ts-autotag
 time([[Config for nvim-ts-autotag]], true)
 try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20nvim-ts-autotag\frequire\0", "config", "nvim-ts-autotag")
 time([[Config for nvim-ts-autotag]], false)
--- Config for: toggleterm.nvim
-time([[Config for toggleterm.nvim]], true)
-try_loadstring("\27LJ\2\nf\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\3\tsize\3\15\14autochdir\1\14direction\15horizontal\nsetup\15toggleterm\frequire\0", "config", "toggleterm.nvim")
-time([[Config for toggleterm.nvim]], false)
+-- Load plugins in order defined by `after`
+time([[Sequenced loading]], true)
+vim.cmd [[ packadd nvim-lspconfig ]]
+vim.cmd [[ packadd lspsaga.nvim ]]
+
+-- Config for: lspsaga.nvim
+try_loadstring("\27LJ\2\n�\1\0\0\5\0\f\0\0156\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\0025\3\6\0=\3\a\0025\3\t\0005\4\b\0=\4\n\3=\3\v\2B\0\2\1K\0\1\0\aui\vcolors\1\0\1\vcolors\0\1\0\1\14normal_bg\f#022746\15definition\1\0\1\tedit\t<CR>\19scroll_preview\1\0\3\19scroll_preview\0\aui\0\15definition\0\1\0\2\14scroll_up\n<C-b>\16scroll_down\n<C-f>\nsetup\flspsaga\frequire\0", "config", "lspsaga.nvim")
+
+time([[Sequenced loading]], false)
 vim.cmd [[augroup packer_load_aucmds]]
 vim.cmd [[au!]]
   -- Filetype lazy-loads
diff --git a/.config/sketchybar/items/widgets/init.lua b/.config/sketchybar/items/widgets/init.lua
index 3416c52..ec04249 100644
--- a/.config/sketchybar/items/widgets/init.lua
+++ b/.config/sketchybar/items/widgets/init.lua
@@ -3,3 +3,4 @@ require("items.widgets.calendar")
 require("items.widgets.volume")
 require("items.widgets.wifi")
 require("items.widgets.cpu")
+-- require("items.widgets.notifications")
diff --git a/.config/sketchybar/items/widgets/notifications.lua b/.config/sketchybar/items/widgets/notifications.lua
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/sketchybar/items/widgets/notifications.lua