lua/user/cmp.lua

@@ -62,7 +62,7 @@ cmp.setup({
 		}),
 		-- Accept currently selected item. If none selected, `select` first item.
 		-- Set `select` to `false` to only confirm explicitly selected items.
-		["<CR>"] = cmp.mapping.confirm({ select = false }),
+		["<CR>"] = cmp.mapping.confirm({ select = true }),
 		["<Tab>"] = cmp.mapping(function(fallback)
 			if cmp.visible() then
 				cmp.select_next_item()

lua/user/dap.lua

@@ -51,15 +51,15 @@ dap.listeners.before.event_exited["dapui_config"] = function()
   dapui.close()
 end
 
--- local codelldb_path = "/usr/lib/codelldb/adapter/codelldb"
--- local liblldb_path = "/usr/lib/codelldb/adapter/libcodelldb.so"
---
--- dap.adapters.codelldb = {
---   type = 'server',
---   host = '127.0.0.1',
---   port = "13000",
---   executable = {
---     command = codelldb_path,
---     args = {"--liblldb", liblldb_path, "--port", "13000", "--params", "{\"showDisassembly\": \"never\"}"},
---   }
--- }
+local codelldb_path = "/usr/lib/codelldb/adapter/codelldb"
+local liblldb_path = "/usr/lib/codelldb/adapter/libcodelldb.so"
+
+dap.adapters.codelldb = {
+  type = 'server',
+  host = '127.0.0.1',
+  port = "13000",
+  executable = {
+    command = codelldb_path,
+    args = {"--liblldb", liblldb_path, "--port", "13000", "--params", "{\"showDisassembly\": \"never\"}"},
+  }
+}

lua/user/keymaps.lua

@@ -99,10 +99,10 @@ keymap("n", "<F17>", "<cmd>lua require'dap'.terminate()<cr>", opts) -- Shift+F5
 --keymap("n", "<leader>di", "<Plug>VimspectorBalloonEval", opts)
 
 -- move.nvim
-keymap('n', '<M-J>', ':MoveLine(1)<cr>', opts)
-keymap('n', '<M-K>', ':MoveLine(-1)<cr>', opts)
-keymap('x', '<M-J>', ':MoveBlock(1)<cr>', opts)
-keymap('x', '<M-K>', ':MoveBlock(-1)<cr>', opts)
+keymap('n', '<M-j>', ':MoveLine(1)<cr>', opts)
+keymap('n', '<M-k>', ':MoveLine(-1)<cr>', opts)
+keymap('x', '<M-j>', ':MoveBlock(1)<cr>', opts)
+keymap('x', '<M-k>', ':MoveBlock(-1)<cr>', opts)
 
 -- disable arrow keys
 keymap("n", "<Right>", "<Nop>", opts)

lua/user/lsp/mason.lua

@@ -1,89 +1,54 @@
 local servers = {
-	"sumneko_lua",
-	"cssls",
-	"html",
-	"tsserver",
-	"pyright",
-	"bashls",
-	"jsonls",
-	"yamlls",
-	"rust_analyzer",
-	"gopls",
+    "sumneko_lua",
+    "cssls",
+    "html",
+    "tsserver",
+    "pyright",
+    "bashls",
+    "jsonls",
+    "yamlls",
+    "rust_analyzer",
+    "gopls"
 }
 
 local settings = {
-	ui = {
-		border = "none",
-		icons = {
-			package_installed = "◍",
-			package_pending = "◍",
-			package_uninstalled = "◍",
-		},
-	},
-	log_level = vim.log.levels.INFO,
-	max_concurrent_installers = 4,
+    ui = {
+        border = "none",
+        icons = {
+            package_installed = "◍",
+            package_pending = "◍",
+            package_uninstalled = "◍",
+        },
+    },
+    log_level = vim.log.levels.INFO,
+    max_concurrent_installers = 4,
 }
 
 require("mason").setup(settings)
 require("mason-lspconfig").setup({
-	ensure_installed = servers,
-	automatic_installation = false,
+    ensure_installed = servers,
+    automatic_installation = false,
 })
 
 local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig")
 if not lspconfig_status_ok then
-	return
+    return
 end
 
 local opts = {}
 
 for _, server in pairs(servers) do
-	opts = {
-		on_attach = require("user.lsp.handlers").on_attach,
-		capabilities = require("user.lsp.handlers").capabilities,
-	}
+    opts = {
+        on_attach = require("user.lsp.handlers").on_attach,
+        capabilities = require("user.lsp.handlers").capabilities,
+    }
 
-	server = vim.split(server, "@")[1]
+    server = vim.split(server, "@")[1]
 
-	local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server)
-	if require_ok then
-		opts = vim.tbl_deep_extend("force", conf_opts, opts)
-	end
+    local require_ok, conf_opts = pcall(require, "user.lsp.settings." .. server)
+    if require_ok then
+        opts = vim.tbl_deep_extend("force", conf_opts, opts)
+    end
 
-	lspconfig[server].setup(opts)
-end
-
-local mason_nvim_dap_ok, mason_nvim_dap = pcall(require, "mason-nvim-dap")
-if mason_nvim_dap_ok then
-    local dap = require('dap')
-	mason_nvim_dap.setup({
-		automatic_setup = true,
-	})
-	mason_nvim_dap.setup_handlers({
-		function(source_name)
-			-- all sources with no handler get passed here
-
-			-- Keep original functionality of `automatic_setup = true`
-			require("mason-nvim-dap.automatic_setup")(source_name)
-		end,
-		python = function(source_name)
-			dap.adapters.python = {
-				type = "executable",
-				command = "/usr/bin/python3",
-				args = {
-					"-m",
-					"debugpy.adapter",
-				},
-			}
-
-			dap.configurations.python = {
-				{
-					type = "python",
-					request = "launch",
-					name = "Launch file",
-					program = "${file}", -- This configuration will launch the current file if used.
-				},
-			}
-		end,
-	})
+    lspconfig[server].setup(opts)
 end

lua/user/plugins.lua

@@ -108,8 +108,7 @@ return packer.startup(function(use)
 
   use { "MunifTanjim/exrc.nvim" }
   -- use { "simrat39/rust-tools.nvim" }
-  -- use { "mfussenegger/nvim-dap-python" }
-  use { "jayp0521/mason-nvim-dap.nvim" }
+  use { "mfussenegger/nvim-dap-python" }
 
   use 'farmergreg/vim-lastplace'
   use 'fedepujol/move.nvim'