perf(nvim,dap): restructure dap plugins

4 files changed, 54 insertions, 48 deletions

diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua b/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua
index c842159..b5961c8 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/cmp.lua
@@ -30,7 +30,7 @@ function M.config()
 	end
 
 	local enabled = function()
-		return (default.enabled() or require("cmp_dap").is_dap_buffer()) and not in_comment()
+		return default.enabled() and not in_comment()
 	end
 
 	cmp.setup.global({
@@ -51,7 +51,6 @@ function M.config()
 			{ name = "nvim_lsp" },
 			{ name = "nvim_lsp_signature_help" },
 			{ name = "path" },
-			{ name = "dap" },
 		},
 	})
 
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
index cff0b07..fe05dad 100644
--- a/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/dap.lua
@@ -1,52 +1,8 @@
-local telescope_dap = {
-	"nvim-telescope/telescope-dap.nvim",
-	dependencies = {
-		"nvim-telescope/telescope.nvim",
-	},
-}
-
-function telescope_dap.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
-
-local cmp_dap = {
-	"rcarriga/cmp-dap",
-	dependencies = {
-		"hrsh7th/nvim-cmp",
-	},
-}
-
-function cmp_dap.config()
-	require("cmp").setup.filetype({ "dap-repl", "dapui_watches", "dapui_hover" }, {
-		sources = {
-			{ name = "dap" },
-		},
-	})
-end
-
 local M = {
 	"mfussenegger/nvim-dap",
 	dependencies = {
-		telescope_dap,
-		cmp_dap,
+		"nvim-telescope/telescope-dap.nvim",
+		"rcarriga/cmp-dap",
 		{
 			"mfussenegger/nvim-dap-python",
 			config = "",
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap/cmp-dap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap/cmp-dap.lua
new file mode 100644
index 0000000..1a8cb36
--- /dev/null
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/dap/cmp-dap.lua
@@ -0,0 +1,17 @@
+local M = {
+	"rcarriga/cmp-dap",
+	ft = { "dap-repl", "dapui_watches", "dapui_hover" },
+	dependencies = {
+		"hrsh7th/nvim-cmp",
+	},
+}
+
+function M.config()
+	require("cmp").setup.filetype({ "dap-repl", "dapui_watches", "dapui_hover" }, {
+		sources = {
+			{ name = "dap" },
+		},
+	})
+end
+
+return M
diff --git a/nvim/.config/nvim/lua/tobyvin/plugins/dap/telescope-dap.lua b/nvim/.config/nvim/lua/tobyvin/plugins/dap/telescope-dap.lua
new file mode 100644
index 0000000..acf8256
--- /dev/null
+++ b/nvim/.config/nvim/lua/tobyvin/plugins/dap/telescope-dap.lua
@@ -0,0 +1,34 @@
+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