diff --git a/init.lua b/init.lua
index 09496837..28e1fa87 100644
--- a/init.lua
+++ b/init.lua
@@ -848,6 +848,17 @@ require('lazy').setup({
     },
   },
   { 'Bilal2453/luvit-meta', lazy = true },
+  {
+    'mfussenegger/nvim-dap',
+    event = 'VeryLazy',
+    dependencies = {
+      { 'williamboman/mason.nvim', config = true },
+      'rcarriga/nvim-dap-ui',
+      'nvim-neotest/nvim-nio',
+      'jay-babu/mason-nvim-dap.nvim',
+      'theHamsta/nvim-dap-virtual-text',
+    },
+  },
   {
     -- Main LSP Configuration
     'neovim/nvim-lspconfig',
@@ -1007,6 +1018,8 @@ require('lazy').setup({
       --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
       --  - settings (table): Override the default settings passed when initializing the server.
       --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
+      local vue_ls_share = vim.fn.expand '$MASON/packages/vue-language-server'
+      local vue_language_server_path = vue_ls_share .. '/node_modules/@vue/language-server'
       local servers = {
         clangd = {},
         -- gopls = {},
@@ -1017,23 +1030,18 @@ require('lazy').setup({
         --    https://github.com/pmizio/typescript-tools.nvim
         --
         -- But for many setups, the LSP (`tsserver`) will work just fine
+        vue_ls = {},
         ts_ls = {
           init_options = {
             plugins = {
               {
                 name = '@vue/typescript-plugin',
+                location = vue_language_server_path,
                 languages = { 'vue' },
               },
             },
           },
-        },
-        volar = {
           filetypes = { 'typescript', 'javascript', 'javascriptreact', 'typescriptreact', 'vue' },
-          init_options = {
-            vue = {
-              hybridMode = false,
-            },
-          },
         },
         bashls = {
           filetypes = { 'sh', 'bash' },
@@ -1411,3 +1419,4 @@ require('lazy').setup({
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
 require 'custom/keymap'
+require 'custom/DAP/dap_config'