Updated debugger support

2 files changed, 12 insertions, 4 deletions

diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua
index 99519d5..1139e3e 100644
--- a/.config/nvim/after/plugin/lsp.lua
+++ b/.config/nvim/after/plugin/lsp.lua
@@ -17,9 +17,16 @@ cmp.setup({
 	})
 })
 
-require('lspconfig').clangd.setup({})
+require('lspconfig').clangd.setup({
+	on_new_config = function(new_config, new_cwd)
+		local status, cmake = pcall(require, "cmake-tools")
+		if status then
+			cmake.clangd_on_new_config(new_config)
+		end
+	end,
+})
 require('lspconfig').gopls.setup({})
 require('lspconfig').texlab.setup({})
 require('lspconfig').pyright.setup({})
 require('lspconfig').marksman.setup({})
-require('lspconfig').zls.setup({})
+
diff --git a/.config/nvim/after/plugin/nvim-dap-lldb.lua b/.config/nvim/after/plugin/nvim-dap-lldb.lua
index 83425fa..7123093 100644
--- a/.config/nvim/after/plugin/nvim-dap-lldb.lua
+++ b/.config/nvim/after/plugin/nvim-dap-lldb.lua
@@ -1,7 +1,7 @@
 local dap = require('dap')
 dap.adapters.lldb = {
   type = 'executable',
-  command = '/opt/homebrew/opt/llvm/bin/lldb-dap', -- adjust as needed, must be absolute path
+  command = os.getenv( "HOME" ) .. '/.local/share/nvim/mason/bin/codelldb', -- adjust as needed, must be absolute path
   name = 'lldb'
 }
 
@@ -12,7 +12,7 @@ dap.configurations.c = {
     type = 'lldb',
     request = 'launch',
     program = function()
-      return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file')
+      return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/build/', 'file')
     end,
     cwd = '${workspaceFolder}',
     stopOnEntry = false,
@@ -32,3 +32,4 @@ dap.configurations.c = {
     -- runInTerminal = false,
   },
 }
+dap.configurations.cpp = dap.configurations.c