Merge 3b7a11cb42 into ef413736e9

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

@@ -16,10 +16,9 @@
 in {
   config = mkMerge [
     (mkIf cfg.enable {
-      vim = {
-        startPlugins = ["nvim-dap"];
+      vim.startPlugins = ["nvim-dap"];
 
-        pluginRC =
+      vim.pluginRC =
         {
           # TODO customizable keymaps
           nvim-dap = entryAnywhere ''
@@ -29,7 +28,7 @@ in {
         }
         // mapAttrs (_: v: (entryAfter ["nvim-dap"] v)) cfg.sources;
 
-        maps.normal = mkMerge [
+      vim.maps.normal = mkMerge [
         (mkSetLuaBinding mappings.continue "require('dap').continue")
         (mkSetLuaBinding mappings.restart "require('dap').restart")
         (mkSetLuaBinding mappings.terminate "require('dap').terminate")
@@ -48,13 +47,11 @@ in {
         (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 = [
+      vim.lazy.plugins = [
         {
           package = "nvim-dap-ui";
           setupModule = "dapui";
@@ -66,7 +63,7 @@ in {
         }
       ];
 
-        pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] (
+      vim.pluginRC.nvim-dap-ui = entryAfter ["nvim-dap"] (
         optionalString cfg.ui.autoStart ''
           dap.listeners.after.event_initialized["dapui_config"] = function()
             require("dapui").open()
@@ -79,7 +76,6 @@ in {
           end
         ''
       );
-      };
     })
   ];
 }