From c05a9c9c4d25f5d4cbaf0346d2f8436b7379fd4f Mon Sep 17 00:00:00 2001
From: "Christoph J. Scherr" <Christoph.Scherr@newtec.de>
Date: Thu, 8 Feb 2024 13:38:13 +0100
Subject: [PATCH] fix auto merge

---
 lua/custom/plugins.lua | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/lua/custom/plugins.lua b/lua/custom/plugins.lua
index d69b9cd..cb96d77 100644
--- a/lua/custom/plugins.lua
+++ b/lua/custom/plugins.lua
@@ -805,29 +805,6 @@ local plugins = {
     version = "^4", -- Recommended
     ft = { "rust" },
     config = function()
-      vim.g.rustaceanvim = {
-        -- Plugin configuration
-        tools = {},
-        -- LSP configuration
-        server = {
-          on_attach = function(client, bufnr)
-            -- you can also put keymaps in here
-          end,
-          default_settings = {
-            -- rust-analyzer language server configuration
-            ["rust-analyzer"] = {},
-          },
-        },
-        -- DAP configuration
-        dap = {},
-      }
-    end,
-  },
-  {
-    "theHamsta/nvim-dap-virtual-text",
-    lazy = false, -- PERF: this can be done more elegant
-    config = function()
-      require("nvim-dap-virtual-text").setup()
       local dap = require "dap"
       vim.g.rustaceanvim = {
         -- Plugin configuration
@@ -846,6 +823,13 @@ local plugins = {
       }
     end,
   },
+  {
+    "theHamsta/nvim-dap-virtual-text",
+    lazy = false, -- PERF: this can be done more elegant
+    config = function()
+      require("nvim-dap-virtual-text").setup()
+    end,
+  },
 }
 
 return plugins