diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 8c1a2c3..a5d5cc5 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -432,7 +432,7 @@ colors:
 #working_directory: None
 
 # Send ESC (\x1b) before characters when alt is pressed.
-#alt_send_esc: true
+alt_send_esc: false
 
 #mouse:
   # Click settings
diff --git a/nvim/init.lua b/nvim/init.lua
index c4d1f17..ae79e73 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -8,20 +8,30 @@ require('packer').startup(function(use)
   use 'j-hui/fidget.nvim'
   use 'ray-x/lsp_signature.nvim'
   use({
-    "glepnir/lspsaga.nvim",
-    branch = "main",
+    'glepnir/lspsaga.nvim',
+    branch = 'main',
     config = function()
-      require("lspsaga").init_lsp_saga({})
+      require('lspsaga').init_lsp_saga({})
     end,
   })
   use {
-    "folke/trouble.nvim",
-    requires = "kyazdani42/nvim-web-devicons",
+    'folke/trouble.nvim',
+    requires = 'kyazdani42/nvim-web-devicons',
     config = function()
-      require("trouble").setup({})
+      require('trouble').setup({})
     end
   }
 
+  -- DAP
+  use 'mfussenegger/nvim-dap'
+  use {
+    'rcarriga/nvim-dap-ui',
+    config = function()
+      require('dapui').setup()
+    end
+  }
+  use 'mfussenegger/nvim-dap-python'
+
   use 'nvim-lualine/lualine.nvim'
   use 'morhetz/gruvbox'
   use 'echasnovski/mini.nvim'
@@ -69,6 +79,7 @@ require('mappings')
 
 require('ts')
 require('lsp')
+require('dap-config')
 require('completion')
 require('mini')
 
diff --git a/nvim/lua/dap-config.lua b/nvim/lua/dap-config.lua
new file mode 100644
index 0000000..680a03a
--- /dev/null
+++ b/nvim/lua/dap-config.lua
@@ -0,0 +1,23 @@
+local dap = require('dap')
+local dapui = require('dapui')
+
+dap.listeners.after.event_initialized["dapui_config"] = function()
+  dapui.open()
+end
+dap.listeners.before.event_terminated["dapui_config"] = function()
+  dapui.close()
+end
+dap.listeners.before.event_exited["dapui_config"] = function()
+  dapui.close()
+end
+
+-- Keymaps
+vim.keymap.set('n', '<Space>b', dap.toggle_breakpoint)
+vim.keymap.set('n', '<Space>c', dap.continue)
+vim.keymap.set('n', '<Space>q', dap.terminate)
+vim.keymap.set('n', '<Space>i', dap.step_into)
+vim.keymap.set('n', '<Space>o', dap.step_out)
+vim.keymap.set('n', '<Space>s', dap.step_over)
+
+-- Adapters
+require('dap-python').setup()
diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
index 097b626..1703e71 100644
--- a/nvim/lua/lsp.lua
+++ b/nvim/lua/lsp.lua
@@ -19,7 +19,7 @@ vim.api.nvim_create_autocmd(
 
 
 -- Language Servers
-local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
 local language_servers = { 'gopls', 'pyright', 'rust_analyzer', 'html', 'cssls', 'tsserver', 'emmet_ls', 'sumneko_lua' }
diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua
index 2fa7658..6572081 100644
--- a/nvim/plugin/packer_compiled.lua
+++ b/nvim/plugin/packer_compiled.lua
@@ -163,6 +163,22 @@ _G.packer_plugins = {
     path = "/home/digyx/.local/share/nvim/site/pack/packer/start/nvim-cmp",
     url = "https://github.com/hrsh7th/nvim-cmp"
   },
+  ["nvim-dap"] = {
+    loaded = true,
+    path = "/home/digyx/.local/share/nvim/site/pack/packer/start/nvim-dap",
+    url = "https://github.com/mfussenegger/nvim-dap"
+  },
+  ["nvim-dap-python"] = {
+    loaded = true,
+    path = "/home/digyx/.local/share/nvim/site/pack/packer/start/nvim-dap-python",
+    url = "https://github.com/mfussenegger/nvim-dap-python"
+  },
+  ["nvim-dap-ui"] = {
+    config = { "\27LJ\2\n3\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\ndapui\frequire\0" },
+    loaded = true,
+    path = "/home/digyx/.local/share/nvim/site/pack/packer/start/nvim-dap-ui",
+    url = "https://github.com/rcarriga/nvim-dap-ui"
+  },
   ["nvim-lspconfig"] = {
     loaded = true,
     path = "/home/digyx/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
@@ -217,14 +233,18 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: lspsaga.nvim
-time([[Config for lspsaga.nvim]], true)
-try_loadstring("\27LJ\2\nA\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\18init_lsp_saga\flspsaga\frequire\0", "config", "lspsaga.nvim")
-time([[Config for lspsaga.nvim]], false)
 -- Config for: trouble.nvim
 time([[Config for trouble.nvim]], true)
 try_loadstring("\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0", "config", "trouble.nvim")
 time([[Config for trouble.nvim]], false)
+-- Config for: nvim-dap-ui
+time([[Config for nvim-dap-ui]], true)
+try_loadstring("\27LJ\2\n3\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\ndapui\frequire\0", "config", "nvim-dap-ui")
+time([[Config for nvim-dap-ui]], false)
+-- Config for: lspsaga.nvim
+time([[Config for lspsaga.nvim]], true)
+try_loadstring("\27LJ\2\nA\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\18init_lsp_saga\flspsaga\frequire\0", "config", "lspsaga.nvim")
+time([[Config for lspsaga.nvim]], false)
 vim.cmd [[augroup packer_load_aucmds]]
 vim.cmd [[au!]]
   -- Event lazy-loads