32 files changed, 19 insertions, 21 deletions
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 1a15372..212fdf2 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -1 +1,13 @@
-require("tobyvin")
+require("tobyvin.options")
+require("tobyvin.filetype")
+require("tobyvin.autocmds")
+require("tobyvin.keymaps")
+require("tobyvin.lsp")
+require("tobyvin.diagnostic")
+require("tobyvin.lazy")
+
+vim.cmd.colorscheme("gruvbox")
+
+-- if require("tobyvin.utils").normal_startup() then
+-- 	require("tobyvin.utils.dashboard")
+-- end
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua b/nvim/.config/nvim/lua/plugins/cmp.lua
index e7ca971..e7ca971 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua
+++ b/nvim/.config/nvim/lua/plugins/cmp.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/comment.lua b/nvim/.config/nvim/lua/plugins/comment.lua
index fa14f6f..fa14f6f 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/comment.lua
+++ b/nvim/.config/nvim/lua/plugins/comment.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/init.lua b/nvim/.config/nvim/lua/plugins/core.lua
index 3c61416..3c61416 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/init.lua
+++ b/nvim/.config/nvim/lua/plugins/core.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua b/nvim/.config/nvim/lua/plugins/dap.lua
index 8d64977..5eeabe1 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
+++ b/nvim/.config/nvim/lua/plugins/dap.lua
@@ -1,8 +1,8 @@
 local M = {
 	"mfussenegger/nvim-dap",
 	dependencies = {
-		"nvim-telescope/telescope-dap.nvim",
-		"rcarriga/cmp-dap",
+		require("plugins/dap/telescope-dap"),
+		require("plugins/dap/cmp-dap"),
 		"mfussenegger/nvim-dap-python",
 		"leoluz/nvim-dap-go",
 		{
@@ -14,7 +14,6 @@ local M = {
 					return " " .. variable.value
 				end,
 			},
-			config = true,
 		},
 	},
 }
@@ -60,14 +59,14 @@ function M.config()
 		require("dap").repl.close()
 	end
 
-	local adapters = require("tobyvin.plugins.dap.adapters")
+	local adapters = require("tobyvin.dap.adapters")
 	for name, adapter in pairs(adapters) do
 		if require("dap").adapters[name] == nil then
 			require("dap").adapters[name] = adapter
 		end
 	end
 
-	local configs = require("tobyvin.plugins.dap.configs")
+	local configs = require("tobyvin.dap.configs")
 	for name, config in pairs(configs) do
 		if require("dap").configurations[name] == nil then
 			require("dap").configurations[name] = config
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap/cmp-dap.lua b/nvim/.config/nvim/lua/plugins/dap/cmp-dap.lua
index 0ee4eda..0ee4eda 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dap/cmp-dap.lua
+++ b/nvim/.config/nvim/lua/plugins/dap/cmp-dap.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap/telescope-dap.lua b/nvim/.config/nvim/lua/plugins/dap/telescope-dap.lua
index acf8256..acf8256 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dap/telescope-dap.lua
+++ b/nvim/.config/nvim/lua/plugins/dap/telescope-dap.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dressing.lua b/nvim/.config/nvim/lua/plugins/dressing.lua
index 02ec398..02ec398 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dressing.lua
+++ b/nvim/.config/nvim/lua/plugins/dressing.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/firenvim.lua b/nvim/.config/nvim/lua/plugins/firenvim.lua
index 68423b1..68423b1 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/firenvim.lua
+++ b/nvim/.config/nvim/lua/plugins/firenvim.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua b/nvim/.config/nvim/lua/plugins/gitsigns.lua
index de232aa..de232aa 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/gitsigns.lua
+++ b/nvim/.config/nvim/lua/plugins/gitsigns.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua b/nvim/.config/nvim/lua/plugins/gruvbox.lua
index 1a84cea..1a84cea 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/gruvbox.lua
+++ b/nvim/.config/nvim/lua/plugins/gruvbox.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/indent_blankline.lua b/nvim/.config/nvim/lua/plugins/indent_blankline.lua
index ed3c328..ed3c328 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/indent_blankline.lua
+++ b/nvim/.config/nvim/lua/plugins/indent_blankline.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/jdtls.lua b/nvim/.config/nvim/lua/plugins/jdtls.lua
index 7ecc0f1..7ecc0f1 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/jdtls.lua
+++ b/nvim/.config/nvim/lua/plugins/jdtls.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua b/nvim/.config/nvim/lua/plugins/lspconfig.lua
index 9016d76..9016d76 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/lspconfig.lua
+++ b/nvim/.config/nvim/lua/plugins/lspconfig.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua b/nvim/.config/nvim/lua/plugins/mason.lua
index a5b0971..a5b0971 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/mason.lua
+++ b/nvim/.config/nvim/lua/plugins/mason.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua b/nvim/.config/nvim/lua/plugins/neodev.lua
index 68b2c6b..68b2c6b 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/neodev.lua
+++ b/nvim/.config/nvim/lua/plugins/neodev.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua b/nvim/.config/nvim/lua/plugins/noice.lua
index 4831175..4831175 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/noice.lua
+++ b/nvim/.config/nvim/lua/plugins/noice.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua b/nvim/.config/nvim/lua/plugins/notify.lua
index 9ee4fb0..9ee4fb0 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/notify.lua
+++ b/nvim/.config/nvim/lua/plugins/notify.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua b/nvim/.config/nvim/lua/plugins/null-ls.lua
index b775334..b775334 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/null-ls.lua
+++ b/nvim/.config/nvim/lua/plugins/null-ls.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/nvim-bqf.lua b/nvim/.config/nvim/lua/plugins/nvim-bqf.lua
index 0857aa6..0857aa6 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/nvim-bqf.lua
+++ b/nvim/.config/nvim/lua/plugins/nvim-bqf.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/presence.lua b/nvim/.config/nvim/lua/plugins/presence.lua
index a58868a..a58868a 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/presence.lua
+++ b/nvim/.config/nvim/lua/plugins/presence.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/refactoring.lua b/nvim/.config/nvim/lua/plugins/refactoring.lua
index 02a11e9..02a11e9 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/refactoring.lua
+++ b/nvim/.config/nvim/lua/plugins/refactoring.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua b/nvim/.config/nvim/lua/plugins/rust-tools.lua
index cbc3954..bc7d1d0 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/rust-tools.lua
+++ b/nvim/.config/nvim/lua/plugins/rust-tools.lua
@@ -12,7 +12,7 @@ local M = {
 			},
 		},
 		server = require("tobyvin.lsp.configs").rust_analyzer,
-		dap = { adapter = require("tobyvin.plugins.dap.adapters").codelldb },
+		dap = { adapter = require("tobyvin.dap.adapters").codelldb },
 	},
 	config = true,
 }
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/schemastore.lua b/nvim/.config/nvim/lua/plugins/schemastore.lua
index 0103a6c..0103a6c 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/schemastore.lua
+++ b/nvim/.config/nvim/lua/plugins/schemastore.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua
index 26a3cd0..26a3cd0 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/telescope.lua
+++ b/nvim/.config/nvim/lua/plugins/telescope.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/todo-comments.lua b/nvim/.config/nvim/lua/plugins/todo-comments.lua
index ba7362d..ba7362d 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/todo-comments.lua
+++ b/nvim/.config/nvim/lua/plugins/todo-comments.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/tokyonight.lua b/nvim/.config/nvim/lua/plugins/tokyonight.lua
index 0304acd..0304acd 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/tokyonight.lua
+++ b/nvim/.config/nvim/lua/plugins/tokyonight.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua b/nvim/.config/nvim/lua/plugins/treesitter.lua
index 8076edb..8076edb 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/treesitter.lua
+++ b/nvim/.config/nvim/lua/plugins/treesitter.lua
diff --git a/nvim/.config/nvim/lua/tobyvin.lua b/nvim/.config/nvim/lua/tobyvin.lua
deleted file mode 100644
index 212fdf2..0000000
--- a/nvim/.config/nvim/lua/tobyvin.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-require("tobyvin.options")
-require("tobyvin.filetype")
-require("tobyvin.autocmds")
-require("tobyvin.keymaps")
-require("tobyvin.lsp")
-require("tobyvin.diagnostic")
-require("tobyvin.lazy")
-
-vim.cmd.colorscheme("gruvbox")
-
--- if require("tobyvin.utils").normal_startup() then
--- 	require("tobyvin.utils.dashboard")
--- end
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap/adapters.lua b/nvim/.config/nvim/lua/tobyvin/dap/adapters.lua
index 4adb6bd..4adb6bd 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dap/adapters.lua
+++ b/nvim/.config/nvim/lua/tobyvin/dap/adapters.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap/configs.lua b/nvim/.config/nvim/lua/tobyvin/dap/configs.lua
index 4b5d7b9..4b5d7b9 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dap/configs.lua
+++ b/nvim/.config/nvim/lua/tobyvin/dap/configs.lua
diff --git a/nvim/.config/nvim/lua/tobyvin/lazy.lua b/nvim/.config/nvim/lua/tobyvin/lazy.lua
index 4099e36..b37cc49 100644
--- a/nvim/.config/nvim/lua/tobyvin/lazy.lua
+++ b/nvim/.config/nvim/lua/tobyvin/lazy.lua
@@ -72,7 +72,7 @@ commands.commands.deactivate = function(opts)
 	end
 end
 
-require("lazy").setup("tobyvin.plugins", {
+require("lazy").setup("plugins", {
 	defaults = {
 		lazy = true,
 	},