diff --git a/.config/nvim/after/plugin/dap.lua b/.config/nvim/after/plugin/dap.lua
new file mode 100644
index 0000000..3a3bb43
--- /dev/null
+++ b/.config/nvim/after/plugin/dap.lua
@@ -0,0 +1,44 @@
+local dap = require("dap")
+local dapui = require("dapui")
+
+dapui.setup()
+
+dap.listeners.after.event_initialized["dapui_config"] = function()
+    dapui.open()
+end
+
+dap.listeners.after.event_terminated["dapui_config"] = function()
+    dapui.close()
+end
+
+dap.listeners.after.event_exited["dapui_config"] = function()
+    dapui.close()
+end
+
+require("dap-python").setup("~/Projects/odoo/venv/bin/python3")
+
+vim.keymap.set("n", "<leader>5", function() dap.continue() end)
+vim.keymap.set("n", "<leader>6", function() dap.step_over() end)
+vim.keymap.set("n", "<leader>+", function() dap.step_into() end)
+vim.keymap.set("n", "<leader>-", function() dap.step_out() end)
+vim.keymap.set("n", "<leader>b", function() dap.toggle_breakpoint() end)
+vim.keymap.set("n", "<leader>B", function() dap.set_breakpoint(vim.fn.input("Breakpoint condition: ")) end)
+vim.keymap.set("n", "<leader>qd", function() dap.terminate() end)
+vim.keymap.set("n", "<leader>rd", function() dap.restart() end)
+
+dap.configurations.python = {
+    {
+        type = "python",
+        request = "launch",
+        name = "Launch Odoo",
+        program = "/home/odoo/Projects/odoo/odoo/odoo-bin",
+        pythonPath = function()
+            return "/home/odoo/Projects/odoo/venv/bin/python3"
+        end,
+        args = {
+            "--addons-path", "/home/odoo/Projects/odoo/enterprise/,/home/odoo/Projects/odoo/odoo/addons/",
+            "--dev", "all",
+            "-d", "rd-demo"
+        }
+    }
+}
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 48bde3c..3cc23d8 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -3,7 +3,6 @@
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
   "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "dotnet.nvim": { "branch": "main", "commit": "f5c52f9f52a3d8ca8dff6916c2228fb41a075274" },
   "everforest-nvim": { "branch": "main", "commit": "d2936185a6d266def29fd7b523d296384580ef08" },
   "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
@@ -12,7 +11,11 @@
   "mason.nvim": { "branch": "main", "commit": "b3689a41dd77e5294498dba9757fb22cc80cbebd" },
   "neogit": { "branch": "master", "commit": "90dcfa7b2bd5f3f35d1a7afe24dde9e2bc482cd4" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
+  "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" },
+  "nvim-dap-python": { "branch": "master", "commit": "bfe572e4458e0ac876b9539a1e9f301c72db8ea0" },
+  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
   "nvim-lspconfig": { "branch": "master", "commit": "a844e89ea0e0e4b207ec550c3b51fb6e471881a4" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" },
   "odoo-neovim": { "branch": "main-default-whe", "commit": "24f06b2eb090086d888e44d229dc2b422014b2f8" },
@@ -21,5 +24,6 @@
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" },
-  "vim-merginal": { "branch": "develop", "commit": "3dca10fd8bce10edbc2024651db4ffb6dd2d89de" }
+  "vim-merginal": { "branch": "develop", "commit": "3dca10fd8bce10edbc2024651db4ffb6dd2d89de" },
+  "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }
 }
diff --git a/.config/nvim/lua/wicked/lazy.lua b/.config/nvim/lua/wicked/lazy.lua
index 7a23512..5181d67 100644
--- a/.config/nvim/lua/wicked/lazy.lua
+++ b/.config/nvim/lua/wicked/lazy.lua
@@ -33,9 +33,10 @@ require("lazy").setup({
         'nvim-treesitter/nvim-treesitter',
         'theprimeagen/harpoon',
         'mbbill/undotree',
+        'tpope/vim-surround',
         'nvim-telescope/telescope-ui-select.nvim',
         'idanarye/vim-merginal',
-        "sphamba/smear-cursor.nvim",
+        'sphamba/smear-cursor.nvim',
         'williamboman/mason.nvim',
         'williamboman/mason-lspconfig.nvim',
         {
@@ -54,25 +55,14 @@ require("lazy").setup({
         'hrsh7th/cmp-buffer',
         'hrsh7th/nvim-cmp',
         'L3MON4D3/LuaSnip',
-        -- {
-        --     "saghen/blink.nvim",
-        --     config = function()
-        --       require("blink").setup({
-        --         modules = {
-        --           cmp = true,
-        --           luasnip = true,
-        --           -- optionally enable more: lsp, luasnip, etc.
-        --         },
-        --       })
-        --     end
-        -- },
-
         {
-            'MoaidHathot/dotnet.nvim',
-            config = function()
-                require("dotnet").setup({})
-            end
-        },
+            'mfussenegger/nvim-dap',
+            dependencies = {
+                'mfussenegger/nvim-dap-python',
+                'rcarriga/nvim-dap-ui',
+                'nvim-neotest/nvim-nio'
+            }
+        }
     },
     -- Configure any other settings here. See the documentation for more details.
     -- colorscheme that will be used when installing plugins.