nvim: native debug -> nvim-gdb

.config/nvim/init.lua

@@ -6,6 +6,5 @@ end
 require("plugins")
 load("options")
 load("mappings")
-load("debug")
 load("disablebuiltin")
 load("colors")

.config/nvim/lua/debug.lua

@@ -1,29 +0,0 @@
--- enable termdebug
-vim.cmd("packadd termdebug")
--- use a usable layout
-vim.g.termdebug_wide = 1
-
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = {
-		"go",
-		"c",
-		"c++",
-	},
-	callback = function()
-		vim.g.termdebugger = "gdb"
-	end,
-})
-
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = "rust",
-	callback = function()
-		vim.g.termdebugger = "rust-gdb"
-	end,
-})
-
-vim.api.nvim_create_autocmd("FileType", {
-	pattern = "python",
-	callback = function()
-		vim.g.termdebugger = "pdbpp"
-	end,
-})

.config/nvim/lua/mappings.lua

@@ -92,13 +92,3 @@ end)
 vim.keymap.set("n", "]d", function()
 	vim.lsp.diagnostic.goto_next()
 end)
-
--- debug
-vim.keymap.set("n", "<leader>db", "<cmd>Break<CR>")
-vim.keymap.set("n", "<leader>dc", "<cmd>Continue<CR>")
-vim.keymap.set("n", "<leader>dd", ":Termdebug ")
-vim.keymap.set("n", "<leader>de", "<cmd>Evaluate<CR>")
-vim.keymap.set("n", "<leader>di", "<cmd>Step<CR>")
-vim.keymap.set("n", "<leader>dn", "<cmd>Over<CR>")
-vim.keymap.set("n", "<leader>dr", "<cmd>Run<CR>")
-vim.keymap.set("n", "<leader>du", "<cmd>Clear<CR>")

.config/nvim/lua/plugins.lua

@@ -2,7 +2,7 @@ require("packer").startup(function()
 	use("wbthomason/packer.nvim")
 
 	--
-	-- LSP
+	-- dev
 	--
 
 	-- lspconfig
@@ -23,10 +23,6 @@ require("packer").startup(function()
 		end,
 	})
 
-	--
-	-- completion
-	--
-
 	-- cmp
 	use({
 		"hrsh7th/nvim-cmp",
@@ -35,22 +31,10 @@ require("packer").startup(function()
 			require("plugins.cmp")
 		end,
 	})
-	use({
+	use({ "hrsh7th/cmp-nvim-lsp", after = "nvim-cmp" })
-		"hrsh7th/cmp-nvim-lsp",
+	use({ "hrsh7th/cmp-vsnip", after = "nvim-cmp" })
-		after = "nvim-cmp",
+	use({ "hrsh7th/cmp-buffer", after = "nvim-cmp" })
-	})
+	use({ "hrsh7th/cmp-path", after = "nvim-cmp" })
-	use({
-		"hrsh7th/cmp-vsnip",
-		after = "nvim-cmp",
-	})
-	use({
-		"hrsh7th/cmp-buffer",
-		after = "nvim-cmp",
-	})
-	use({
-		"hrsh7th/cmp-path",
-		after = "nvim-cmp",
-	})
 
 	-- snippets
 	use({
@@ -110,6 +94,14 @@ require("packer").startup(function()
 		end,
 	})
 
+	use({
+		"sakhnik/nvim-gdb",
+		event = "BufEnter",
+		config = function()
+			require("plugins.gdb")
+		end,
+	})
+
 	-- comment.nvim
 	use({
 		"numToStr/Comment.nvim",
@@ -230,7 +222,7 @@ require("packer").startup(function()
 
 	use({
 		"nvim-orgmode/orgmode",
-		after = 'nvim-treesitter',
+		after = "nvim-treesitter",
 		config = function()
 			require("plugins.orgmode")
 		end,

.config/nvim/lua/plugins/formatter.lua

@@ -1,4 +1,4 @@
-require("formatter").setup {
+require("formatter").setup({
 	filetype = {
 		lua = {
 			require("formatter.filetypes.lua").stylua,
@@ -19,5 +19,5 @@ require("formatter").setup {
 		toml = {
 			require("formatter.filetypes.toml").taplo,
 		},
-	}
+	},
-}
+})

.config/nvim/lua/plugins/gdb.lua

@@ -0,0 +1,35 @@
+-- settings
+vim.g.nvimgdb_use_find_executables = 0
+vim.g.nvimgdb_use_cmake_to_find_executables = 0
+vim.g.nvimgdb_disable_start_keymaps = 1
+
+-- filetype mappings
+vim.api.nvim_create_autocmd({ "FileType" }, {
+	pattern = "python",
+	callback = function()
+		vim.keymap.set("n", "<leader>dd", ":GdbStartPDB python -m pdb ")
+	end,
+})
+
+vim.api.nvim_create_autocmd({ "FileType" }, {
+	pattern = "rust",
+	callback = function()
+		vim.keymap.set("n", "<leader>dd", ":GdbStart rust-gdb target/debug/")
+	end,
+})
+
+vim.api.nvim_create_autocmd({ "FileType" }, {
+	pattern = { "go", "c" },
+	callback = function()
+		vim.keymap.set("n", "<leader>dd", ":GdbStart gdb -q ")
+	end,
+})
+
+-- other mappings
+vim.keymap.set("n", "<leader>db", "<cmd>GdbBreakpointToggle<CR>")
+vim.keymap.set("n", "<leader>dc", "<cmd>GdbContinue<CR>")
+vim.keymap.set("n", "<leader>du", "<cmd>GdbUntil<CR>")
+vim.keymap.set("n", "<leader>ds", "<cmd>GdbStep<CR>")
+vim.keymap.set("n", "<leader>dn", "<cmd>GdbNext<CR>")
+vim.keymap.set("n", "<leader>do", "<cmd>GdbFinish<CR>")
+vim.keymap.set("n", "<leader>dw", ":GdbCreateWatch ")

.config/nvim/lua/plugins/whichkey.lua

@@ -7,14 +7,12 @@ wk.register({
 	},
 	d = {
 		name = "Debug",
-		b = "Set Breakpoint",
+		b = "Toggle Breakpoint",
-		c = "Continue",
+		f = "Finish / Step Out",
-		d = "Termdebug",
+		n = "Next",
-		e = "Evaluate",
+		s = "Step Into",
-		s = "Step",
+		u = "Until",
-		o = "Over",
+		w = "Create Watch",
-		r = "Run",
-		u = "Clear Breakpoint",
 	},
 	g = {
 		name = "Language",