3 files changed, 44 insertions, 53 deletions
diff --git a/nvim/.config/nvim/lua/plugins/dap.lua b/nvim/.config/nvim/lua/plugins/dap.lua
index 5eeabe1..009adb1 100644
--- a/nvim/.config/nvim/lua/plugins/dap.lua
+++ b/nvim/.config/nvim/lua/plugins/dap.lua
@@ -1,8 +1,50 @@
 local M = {
 	"mfussenegger/nvim-dap",
 	dependencies = {
-		require("plugins/dap/telescope-dap"),
-		require("plugins/dap/cmp-dap"),
+		{
+			"nvim-telescope/telescope-dap.nvim",
+			dependencies = {
+				"nvim-telescope/telescope.nvim",
+			},
+			init = function()
+				vim.keymap.set("n", "<leader>dC", function()
+					require("telescope").extensions.dap.commands()
+				end, { desc = "commands" })
+
+				vim.keymap.set("n", "<leader>dd", function()
+					require("telescope").extensions.dap.configurations()
+				end, { desc = "configurations" })
+
+				vim.keymap.set("n", "<leader>dl", function()
+					require("telescope").extensions.dap.list_breakpoints()
+				end, { desc = "breakpoints" })
+
+				vim.keymap.set("n", "<leader>df", function()
+					require("telescope").extensions.dap.frames()
+				end, { desc = "frames" })
+
+				vim.keymap.set("n", "<leader>dv", function()
+					require("telescope").extensions.dap.variables()
+				end, { desc = "variables" })
+			end,
+			config = function()
+				require("telescope").load_extension("dap")
+			end,
+		},
+		{
+			"rcarriga/cmp-dap",
+			ft = { "dap-repl" },
+			dependencies = {
+				"hrsh7th/nvim-cmp",
+			},
+			config = function()
+				require("cmp").setup.filetype({ "dap-repl" }, {
+					sources = {
+						{ name = "dap" },
+					},
+				})
+			end,
+		},
 		"mfussenegger/nvim-dap-python",
 		"leoluz/nvim-dap-go",
 		{
diff --git a/nvim/.config/nvim/lua/plugins/dap/cmp-dap.lua b/nvim/.config/nvim/lua/plugins/dap/cmp-dap.lua
deleted file mode 100644
index 0ee4eda..0000000
--- a/nvim/.config/nvim/lua/plugins/dap/cmp-dap.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-local M = {
-	"rcarriga/cmp-dap",
-	ft = { "dap-repl" },
-	dependencies = {
-		"hrsh7th/nvim-cmp",
-	},
-}
-
-function M.config()
-	require("cmp").setup.filetype({ "dap-repl" }, {
-		sources = {
-			{ name = "dap" },
-		},
-	})
-end
-
-return M
diff --git a/nvim/.config/nvim/lua/plugins/dap/telescope-dap.lua b/nvim/.config/nvim/lua/plugins/dap/telescope-dap.lua
deleted file mode 100644
index acf8256..0000000
--- a/nvim/.config/nvim/lua/plugins/dap/telescope-dap.lua
+++ /dev/null
@@ -1,34 +0,0 @@
-local M = {
-	"nvim-telescope/telescope-dap.nvim",
-	dependencies = {
-		"nvim-telescope/telescope.nvim",
-	},
-}
-
-function M.init()
-	vim.keymap.set("n", "<leader>dC", function()
-		require("telescope").extensions.dap.commands()
-	end, { desc = "commands" })
-
-	vim.keymap.set("n", "<leader>dd", function()
-		require("telescope").extensions.dap.configurations()
-	end, { desc = "configurations" })
-
-	vim.keymap.set("n", "<leader>dl", function()
-		require("telescope").extensions.dap.list_breakpoints()
-	end, { desc = "breakpoints" })
-
-	vim.keymap.set("n", "<leader>df", function()
-		require("telescope").extensions.dap.frames()
-	end, { desc = "frames" })
-
-	vim.keymap.set("n", "<leader>dv", function()
-		require("telescope").extensions.dap.variables()
-	end, { desc = "variables" })
-end
-
-function M.config()
-	require("telescope").load_extension("dap")
-end
-
-return M