Merge 3b7a11cb42 into ef413736e9

modules/plugins/debugger/nvim-dap/config.nix

@@ -16,70 +16,66 @@
 in {
   config = mkMerge [
     (mkIf cfg.enable {
-      vim = {
-        startPlugins = ["nvim-dap"];
+      vim.startPlugins = ["nvim-dap"];
 
-        pluginRC =
-          {
-            # TODO customizable keymaps
-            nvim-dap = entryAnywhere ''
-              local dap = require("dap")
-              vim.fn.sign_define("DapBreakpoint", { text = "🛑", texthl = "ErrorMsg", linehl = "", numhl = "" })
-            '';
-          }
-          // mapAttrs (_: v: (entryAfter ["nvim-dap"] v)) cfg.sources;
+      vim.pluginRC =
+        {
+          # TODO customizable keymaps
+          nvim-dap = entryAnywhere ''
+            local dap = require("dap")
+            vim.fn.sign_define("DapBreakpoint", { text = "🛑", texthl = "ErrorMsg", linehl = "", numhl = "" })
+          '';
+        }
+        // mapAttrs (_: v: (entryAfter ["nvim-dap"] v)) cfg.sources;
 
-        maps.normal = mkMerge [
-          (mkSetLuaBinding mappings.continue "require('dap').continue")
-          (mkSetLuaBinding mappings.restart "require('dap').restart")
-          (mkSetLuaBinding mappings.terminate "require('dap').terminate")
-          (mkSetLuaBinding mappings.runLast "require('dap').run_last")
+      vim.maps.normal = mkMerge [
+        (mkSetLuaBinding mappings.continue "require('dap').continue")
+        (mkSetLuaBinding mappings.restart "require('dap').restart")
+        (mkSetLuaBinding mappings.terminate "require('dap').terminate")
+        (mkSetLuaBinding mappings.runLast "require('dap').run_last")
 
-          (mkSetLuaBinding mappings.toggleRepl "require('dap').repl.toggle")
-          (mkSetLuaBinding mappings.hover "require('dap.ui.widgets').hover")
-          (mkSetLuaBinding mappings.toggleBreakpoint "require('dap').toggle_breakpoint")
+        (mkSetLuaBinding mappings.toggleRepl "require('dap').repl.toggle")
+        (mkSetLuaBinding mappings.hover "require('dap.ui.widgets').hover")
+        (mkSetLuaBinding mappings.toggleBreakpoint "require('dap').toggle_breakpoint")
 
-          (mkSetLuaBinding mappings.runToCursor "require('dap').run_to_cursor")
-          (mkSetLuaBinding mappings.stepInto "require('dap').step_into")
-          (mkSetLuaBinding mappings.stepOut "require('dap').step_out")
-          (mkSetLuaBinding mappings.stepOver "require('dap').step_over")
-          (mkSetLuaBinding mappings.stepBack "require('dap').step_back")
+        (mkSetLuaBinding mappings.runToCursor "require('dap').run_to_cursor")
+        (mkSetLuaBinding mappings.stepInto "require('dap').step_into")
+        (mkSetLuaBinding mappings.stepOut "require('dap').step_out")
+        (mkSetLuaBinding mappings.stepOver "require('dap').step_over")
+        (mkSetLuaBinding mappings.stepBack "require('dap').step_back")
 
-          (mkSetLuaBinding mappings.goUp "require('dap').up")
-          (mkSetLuaBinding mappings.goDown "require('dap').down")
-        ];
-      };
+        (mkSetLuaBinding mappings.goUp "require('dap').up")
+        (mkSetLuaBinding mappings.goDown "require('dap').down")
+      ];
     })
     (mkIf (cfg.enable && cfg.ui.enable) {
-      vim = {
-        startPlugins = ["nvim-nio"];
+      vim.startPlugins = ["nvim-nio"];
 
-        lazy.plugins = [
-          {
-            package = "nvim-dap-ui";
-            setupModule = "dapui";
-            setupOpts = {};
+      vim.lazy.plugins = [
+        {
+          package = "nvim-dap-ui";
+          setupModule = "dapui";
+          setupOpts = {};
 
-            keys = [
-              (mkSetLuaLznBinding mappings.toggleDapUI "function() require('dapui').toggle() end")
-            ];
-          }
-        ];
+          keys = [
+            (mkSetLuaLznBinding mappings.toggleDapUI "function() require('dapui').toggle() end")
+          ];
+        }
+      ];
 
-        pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] (
-          optionalString cfg.ui.autoStart ''
-            dap.listeners.after.event_initialized["dapui_config"] = function()
-              require("dapui").open()
-            end
-            dap.listeners.before.event_terminated["dapui_config"] = function()
-              require("dapui").close()
-            end
-            dap.listeners.before.event_exited["dapui_config"] = function()
-              require("dapui").close()
-            end
-          ''
-        );
-      };
+      vim.pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] (
+        optionalString cfg.ui.autoStart ''
+          dap.listeners.after.event_initialized["dapui_config"] = function()
+            require("dapui").open()
+          end
+          dap.listeners.before.event_terminated["dapui_config"] = function()
+            require("dapui").close()
+          end
+          dap.listeners.before.event_exited["dapui_config"] = function()
+            require("dapui").close()
+          end
+        ''
+      );
     })
   ];
 }