fix(nvim): clean up unused and depreciated stuff

6 files changed, 10 insertions, 13 deletions

diff --git a/nvim/.config/nvim/after/ftplugin/help.lua b/nvim/.config/nvim/after/ftplugin/help.lua
deleted file mode 100644
index 0fd3812..0000000
--- a/nvim/.config/nvim/after/ftplugin/help.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.opt_local.colorcolumn = nil
-vim.api.nvim_create_autocmd("BufWinEnter", {
-	buffer = 0,
-	command = "wincmd L",
-})
diff --git a/nvim/.config/nvim/lua/plugins/oil.lua b/nvim/.config/nvim/lua/plugins/oil.lua
index 4b66577..ae05804 100644
--- a/nvim/.config/nvim/lua/plugins/oil.lua
+++ b/nvim/.config/nvim/lua/plugins/oil.lua
@@ -35,7 +35,7 @@ function M:init()
 
 	if vim.fn.argc() == 1 then
 		arg = vim.fn.argv(0) --[[@as string]]
-		local stat = vim.loop.fs_stat(arg)
+		local stat = vim.uv.fs_stat(arg)
 		local adapter = string.match(arg, "^([%l-]*)://")
 		if (stat and stat.type == "directory") or adapter == "oil-ssh" then
 			require("lazy").load({ plugins = { "oil.nvim" } })
diff --git a/nvim/.config/nvim/lua/tobyvin/lazy.lua b/nvim/.config/nvim/lua/tobyvin/lazy.lua
index f270b8b..0f1a6c3 100644
--- a/nvim/.config/nvim/lua/tobyvin/lazy.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lazy.lua
@@ -1,5 +1,5 @@
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
+if not vim.uv.fs_stat(lazypath) then
 	vim.fn.system({
 		"git",
 		"clone",
diff --git a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
index 18f490c..d59ef53 100644
--- a/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lsp/configs.lua
@@ -8,7 +8,7 @@ local M = {
 				explainshellEndpoint = "https://explainshell.com",
 				includeAllWorkspaceSymbols = true,
 				shellcheckArguments = {
-					string.format("--source-path=%s", vim.loop.cwd()),
+					string.format("--source-path=%s", vim.uv.cwd()),
 				},
 			},
 		},
diff --git a/nvim/.config/nvim/lua/tobyvin/utils.lua b/nvim/.config/nvim/lua/tobyvin/utils.lua
index 1cb6329..bf2d5b2 100644
--- a/nvim/.config/nvim/lua/tobyvin/utils.lua
+++ b/nvim/.config/nvim/lua/tobyvin/utils.lua
@@ -17,7 +17,9 @@ function M.select(items, opts, on_choice)
 		on_choice(items[1])
 	elseif #items > 1 then
 		vim.ui.select(items, opts, function(item, idx)
-			return item ~= nil and on_choice(item, idx) or nil
+			if item ~= nil then
+				on_choice(item, idx)
+			end
 		end)
 	else
 		vim.print("No results found")
@@ -37,7 +39,7 @@ end
 ---@param ms integer
 ---@param fn function
 function M.debounce(ms, fn)
-	local timer = vim.loop.new_timer()
+	local timer = vim.uv.new_timer()
 	return function(...)
 		local argv = { ... }
 		timer:start(ms, 0, function()
@@ -51,7 +53,7 @@ function M.system(...)
 	local s = vim.system(...)
 	--- @param obj vim.SystemObj
 	--- @param cmd string[]
-	--- @param opts SystemOpts|nil)
+	--- @param opts vim.SystemOpts|nil)
 	--- @param on_exit function|nil
 	---@diagnostic disable-next-line: inject-field
 	s.pipe = function(obj, cmd, opts, on_exit)
@@ -61,7 +63,7 @@ function M.system(...)
 
 	--- @param obj vim.SystemObj
 	--- @param cmd string[]
-	--- @param opts SystemOpts|nil)
+	--- @param opts vim.SystemOpts|nil)
 	--- @param on_exit function|nil
 	---@diagnostic disable-next-line: inject-field
 	s.try_pipe = function(obj, cmd, opts, on_exit)
diff --git a/nvim/.config/nvim/lua/tobyvin/utils/session.lua b/nvim/.config/nvim/lua/tobyvin/utils/session.lua
index 8634aa4..02eae38 100644
--- a/nvim/.config/nvim/lua/tobyvin/utils/session.lua
+++ b/nvim/.config/nvim/lua/tobyvin/utils/session.lua
@@ -6,7 +6,7 @@ function M.session_path()
 		return vim.v.this_session
 	end
 
-	local name = vim.loop.cwd():gsub(":", "++"):gsub(U.fs.sep, "%%"):gsub("$", ".vim")
+	local name = vim.uv.cwd():gsub(":", "++"):gsub(U.fs.sep, "%%"):gsub("$", ".vim")
 
 	if name == nil or name == "" then
 		error(("Invalid session name: '%s'"):format(name))