From d0c31ea3b73e0c9db1bcecf31c6fec3a1052b4b6 Mon Sep 17 00:00:00 2001 From: Oliver Hartmann Date: Wed, 5 Oct 2022 19:36:13 +0200 Subject: [PATCH] lazy loading of dap and cmake --- lua/my_plugins.lua | 35 +++++++++++++++++++++++++++++------ lua/setup/my_dap.lua | 19 +++++++++++-------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/lua/my_plugins.lua b/lua/my_plugins.lua index d9d3bf5..f8d5a50 100644 --- a/lua/my_plugins.lua +++ b/lua/my_plugins.lua @@ -105,12 +105,19 @@ return require('packer').startup(function() { 'hrsh7th/cmp-nvim-lsp-signature-help' }, { 'p00f/clangd_extensions.nvim' }, }, + as = 'cmp', config = get_setup('cmp'), }) use({ 'L3MON4D3/LuaSnip', config = get_setup('luasnip') }) use({ 'rafamadriz/friendly-snippets' }) use({ 'onsails/lspkind-nvim' }) - use({ 'Shatur/neovim-cmake', requires = { 'mfussenegger/nvim-dap' }, config = get_setup('cmake') }) + use({ 'Shatur/neovim-cmake', + requires = { 'mfussenegger/nvim-dap' }, + config = get_setup('cmake'), + opt = true, + module = 'cmake', + cmd = 'CMake' + }) use({ 'hoob3rt/lualine.nvim', requires = { 'kyazdani42/nvim-web-devicons', opt = true }, @@ -214,12 +221,28 @@ return require('packer').startup(function() 'mfussenegger/nvim-dap', requires = { 'mfussenegger/nvim-dap-python', - 'theHamsta/nvim-dap-virtual-text', - 'nvim-telescope/telescope-dap.nvim', - 'rcarriga/cmp-dap', - 'rcarriga/nvim-dap-ui' + { + 'theHamsta/nvim-dap-virtual-text', + module = 'nvim-dap-virtual-text' + }, + { + 'nvim-telescope/telescope-dap.nvim', + module = 'telescope._extensions.dap', + requires = 'telescope.nvim', + }, + { + 'rcarriga/cmp-dap', + requires = 'cmp' + }, + { + 'rcarriga/nvim-dap-ui', + module = 'dapui' + }, }, - config = get_setup('my_dap') + keys = { '', '' }, + module = 'dap', + config = get_setup('my_dap'), + opt = true, } use { 'sindrets/diffview.nvim', diff --git a/lua/setup/my_dap.lua b/lua/setup/my_dap.lua index 53b41ce..b4f38a9 100644 --- a/lua/setup/my_dap.lua +++ b/lua/setup/my_dap.lua @@ -1,4 +1,5 @@ dap = require('dap') + local opts = { noremap = true, silent = false } -- vim.keymap.set('n', '', dap.continue(), opts) vim.keymap.set('n', '', ":lua require('dap').continue()", opts) @@ -28,7 +29,9 @@ dap.adapters.python = { }; } -local dap, dapui = require("dap"), require("dapui") +local dap= require("dap") +local dapui = require("dapui") +dapui.setup() dap.listeners.after.event_initialized["dapui_config"] = function() dapui.open() end @@ -149,11 +152,11 @@ dap.configurations.cpp = { -- EXTENSIONS -require("nvim-dap-virtual-text").setup() +require('nvim-dap-virtual-text').setup() require('telescope').load_extension('dap') --- require("cmp").setup.filetype({ "dap-repl", "dapui_watches" }, { --- sources = { --- { name = "dap" }, --- }, --- }) -require("dapui").setup() +require('cmp').setup.filetype({ 'dap-repl', 'dapui_watches', 'dapui_hover' }, { + sources = { + { name = 'dap' }, + }, +}) +