Compare commits
3 commits
70c5ea6915
...
76fed65fbb
Author | SHA1 | Date | |
---|---|---|---|
76fed65fbb | |||
aa149d21ef | |||
8befcfc23b |
5 changed files with 87 additions and 51 deletions
|
@ -62,7 +62,7 @@ cmp.setup({
|
||||||
}),
|
}),
|
||||||
-- Accept currently selected item. If none selected, `select` first item.
|
-- Accept currently selected item. If none selected, `select` first item.
|
||||||
-- Set `select` to `false` to only confirm explicitly selected items.
|
-- Set `select` to `false` to only confirm explicitly selected items.
|
||||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
["<CR>"] = cmp.mapping.confirm({ select = false }),
|
||||||
["<Tab>"] = cmp.mapping(function(fallback)
|
["<Tab>"] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
|
|
|
@ -51,15 +51,15 @@ dap.listeners.before.event_exited["dapui_config"] = function()
|
||||||
dapui.close()
|
dapui.close()
|
||||||
end
|
end
|
||||||
|
|
||||||
local codelldb_path = "/usr/lib/codelldb/adapter/codelldb"
|
-- local codelldb_path = "/usr/lib/codelldb/adapter/codelldb"
|
||||||
local liblldb_path = "/usr/lib/codelldb/adapter/libcodelldb.so"
|
-- local liblldb_path = "/usr/lib/codelldb/adapter/libcodelldb.so"
|
||||||
|
--
|
||||||
dap.adapters.codelldb = {
|
-- dap.adapters.codelldb = {
|
||||||
type = 'server',
|
-- type = 'server',
|
||||||
host = '127.0.0.1',
|
-- host = '127.0.0.1',
|
||||||
port = "13000",
|
-- port = "13000",
|
||||||
executable = {
|
-- executable = {
|
||||||
command = codelldb_path,
|
-- command = codelldb_path,
|
||||||
args = {"--liblldb", liblldb_path, "--port", "13000", "--params", "{\"showDisassembly\": \"never\"}"},
|
-- args = {"--liblldb", liblldb_path, "--port", "13000", "--params", "{\"showDisassembly\": \"never\"}"},
|
||||||
}
|
-- }
|
||||||
}
|
-- }
|
||||||
|
|
|
@ -99,10 +99,10 @@ keymap("n", "<F17>", "<cmd>lua require'dap'.terminate()<cr>", opts) -- Shift+F5
|
||||||
--keymap("n", "<leader>di", "<Plug>VimspectorBalloonEval", opts)
|
--keymap("n", "<leader>di", "<Plug>VimspectorBalloonEval", opts)
|
||||||
|
|
||||||
-- move.nvim
|
-- move.nvim
|
||||||
keymap('n', '<M-j>', ':MoveLine(1)<cr>', opts)
|
keymap('n', '<M-J>', ':MoveLine(1)<cr>', opts)
|
||||||
keymap('n', '<M-k>', ':MoveLine(-1)<cr>', opts)
|
keymap('n', '<M-K>', ':MoveLine(-1)<cr>', opts)
|
||||||
keymap('x', '<M-j>', ':MoveBlock(1)<cr>', opts)
|
keymap('x', '<M-J>', ':MoveBlock(1)<cr>', opts)
|
||||||
keymap('x', '<M-k>', ':MoveBlock(-1)<cr>', opts)
|
keymap('x', '<M-K>', ':MoveBlock(-1)<cr>', opts)
|
||||||
|
|
||||||
-- disable arrow keys
|
-- disable arrow keys
|
||||||
keymap("n", "<Right>", "<Nop>", opts)
|
keymap("n", "<Right>", "<Nop>", opts)
|
||||||
|
|
|
@ -8,7 +8,7 @@ local servers = {
|
||||||
"jsonls",
|
"jsonls",
|
||||||
"yamlls",
|
"yamlls",
|
||||||
"rust_analyzer",
|
"rust_analyzer",
|
||||||
"gopls"
|
"gopls",
|
||||||
}
|
}
|
||||||
|
|
||||||
local settings = {
|
local settings = {
|
||||||
|
@ -52,3 +52,38 @@ for _, server in pairs(servers) do
|
||||||
|
|
||||||
lspconfig[server].setup(opts)
|
lspconfig[server].setup(opts)
|
||||||
end
|
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,
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
|
@ -108,7 +108,8 @@ return packer.startup(function(use)
|
||||||
|
|
||||||
use { "MunifTanjim/exrc.nvim" }
|
use { "MunifTanjim/exrc.nvim" }
|
||||||
-- use { "simrat39/rust-tools.nvim" }
|
-- use { "simrat39/rust-tools.nvim" }
|
||||||
use { "mfussenegger/nvim-dap-python" }
|
-- use { "mfussenegger/nvim-dap-python" }
|
||||||
|
use { "jayp0521/mason-nvim-dap.nvim" }
|
||||||
|
|
||||||
use 'farmergreg/vim-lastplace'
|
use 'farmergreg/vim-lastplace'
|
||||||
use 'fedepujol/move.nvim'
|
use 'fedepujol/move.nvim'
|
||||||
|
|
Loading…
Reference in a new issue