2 files changed, 137 insertions, 4 deletions
diff --git a/modules/development/nixvim/plugins/dap-ui.nix b/modules/development/nixvim/plugins/dap-ui.nix
index 5885e54..cc25d2d 100644
--- a/modules/development/nixvim/plugins/dap-ui.nix
+++ b/modules/development/nixvim/plugins/dap-ui.nix
@@ -1,7 +1,25 @@
 # A UI for nvim-dap.
 { config, lib, ... }:
 {
-  config.programs.nixvim.plugins.dap-ui = lib.mkIf config.development.nixvim.enable {
-    enable = true;
+  config.programs.nixvim = lib.mkIf config.development.nixvim.enable {
+    plugins.dap-ui = {
+      enable = true;
+    };
+
+    keymaps = [
+      # dap-ui controls
+      {
+        mode = "n";
+        key = "<leader>du";
+        action = "<cmd>lua require('dapui').toggle()<CR>";
+        options.desc = "Debug: Toggle UI";
+      }
+      {
+        mode = "n";
+        key = "<leader>de";
+        action = "<cmd>lua require('dapui').eval()<CR>";
+        options.desc = "Debug: Eval Expression Under Cursor";
+      }
+    ];
   };
 }
diff --git a/modules/development/nixvim/plugins/dap.nix b/modules/development/nixvim/plugins/dap.nix
index 215a41c..f45e029 100644
--- a/modules/development/nixvim/plugins/dap.nix
+++ b/modules/development/nixvim/plugins/dap.nix
@@ -1,7 +1,122 @@
 # Debug Adapter Protocol client implementation for Neovim.
 { config, lib, ... }:
 {
-  config.programs.nixvim.plugins.dap = lib.mkIf config.development.nixvim.enable {
-    enable = true;
+  config.programs.nixvim = lib.mkIf config.development.nixvim.enable {
+    plugins.dap = {
+      enable = true;
+
+      # Example adapter — adjust/add per language you actually debug.
+      # This one assumes you have `netcoredbg`/`codelldb`/etc. available,
+      # swap for whatever debuggers you use.
+      adapters.servers = {
+        # Example: python debugpy adapter
+        # python = {
+        #   command = "${pkgs.python3Packages.debugpy}/bin/python";
+        #   args = [ "-m" "debugpy.adapter" ];
+        # };
+      };
+    };
+
+    keymaps = [
+      # Core DAP controls
+      {
+        mode = "n";
+        key = "<leader>dc";
+        action = "<cmd>lua require('dap').continue()<CR>";
+        options.desc = "Debug: Continue";
+      }
+      {
+        mode = "n";
+        key = "<leader>di";
+        action = "<cmd>lua require('dap').step_into()<CR>";
+        options.desc = "Debug: Step Into";
+      }
+      {
+        mode = "n";
+        key = "<leader>do";
+        action = "<cmd>lua require('dap').step_over()<CR>";
+        options.desc = "Debug: Step Over";
+      }
+      {
+        mode = "n";
+        key = "<leader>dO";
+        action = "<cmd>lua require('dap').step_out()<CR>";
+        options.desc = "Debug: Step Out";
+      }
+      {
+        mode = "n";
+        key = "<leader>db";
+        action = "<cmd>lua require('dap').toggle_breakpoint()<CR>";
+        options.desc = "Debug: Toggle Breakpoint";
+      }
+      {
+        mode = "n";
+        key = "<leader>dB";
+        action = "<cmd>lua require('dap').set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>";
+        options.desc = "Debug: Conditional Breakpoint";
+      }
+      {
+        mode = "n";
+        key = "<leader>dl";
+        action = "<cmd>lua require('dap').run_last()<CR>";
+        options.desc = "Debug: Run Last";
+      }
+      {
+        mode = "n";
+        key = "<leader>dt";
+        action = "<cmd>lua require('dap').terminate()<CR>";
+        options.desc = "Debug: Terminate";
+      }
+      {
+        mode = "n";
+        key = "<leader>dr";
+        action = "<cmd>lua require('dap').repl.toggle()<CR>";
+        options.desc = "Debug: Toggle REPL";
+      }
+      {
+        mode = "n";
+        key = "<leader>dd";
+        action = "<cmd>lua vim.diagnostic.open_float()<CR>";
+        options.desc = "Diagnostics: Line diagnostics float";
+      }
+      {
+        mode = "n";
+        key = "<leader>dx";
+        action = "<cmd>lua vim.diagnostic.close()<CR>";
+        options.desc = "Diagnostics: Close float";
+      }
+      {
+        mode = "n";
+        key = "<leader>dn";
+        action = "<cmd>lua vim.diagnostic.goto_next()<CR>";
+        options.desc = "Diagnostics: Next";
+      }
+      {
+        mode = "n";
+        key = "<leader>dp";
+        action = "<cmd>lua vim.diagnostic.goto_prev()<CR>";
+        options.desc = "Diagnostics: Previous";
+      }
+      {
+        mode = "n";
+        key = "<leader>dq";
+        action = "<cmd>lua vim.diagnostic.setloclist()<CR>";
+        options.desc = "Diagnostics: Load location list";
+      }
+    ];
+
+    # Auto open/close dap-ui with the debug session lifecycle
+    extraConfigLua = ''
+      local dap, dapui = require("dap"), require("dapui")
+      dap.listeners.after.event_initialized["dapui_config"] = function()
+        dapui.open()
+      end
+      dap.listeners.before.event_terminated["dapui_config"] = function()
+        dapui.close()
+      end
+      dap.listeners.before.event_exited["dapui_config"] = function()
+        dapui.close()
+      end
+    '';
   };
 }