diff --git a/lazy-lock.json b/lazy-lock.json index f807ffb..2d512a9 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -8,29 +8,29 @@ "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" }, - "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" }, + "fidget.nvim": { "branch": "main", "commit": "7fa433a83118a70fe24c1ce88d5f0bd3453c0970" }, + "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" }, "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, - "lspkind-nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lspkind-nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "lunar.nvim": { "branch": "master", "commit": "08bbc93b96ad698d22fc2aa01805786bcedc34b9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0b9bb925c000ae649ff7e7149c8cd00031f4b539" }, - "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, - "minuet-ai.nvim": { "branch": "main", "commit": "cb37724d9513759ca2e907ab541424358fb2a90b" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c953789db7fd28eafe5eb5659846d34b5024b3cc" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "minuet-ai.nvim": { "branch": "main", "commit": "3d25c24487876676d29d325c01ce108cbdbd0753" }, "mssql.nvim": { "branch": "main", "commit": "d3d3078b42988ae90b9d0a17d7bdb44b1b6d18e3" }, - "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, - "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, - "nvim-dap": { "branch": "master", "commit": "5860c7c501eb428d3137ee22c522828d20cca0b3" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, + "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, + "nvim-dap": { "branch": "master", "commit": "e47878dcf1ccc30136b30d19ab19fe76946d61cd" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-jdtls": { "branch": "master", "commit": "943e2398aba6b7e976603708450c6c93c600e830" }, - "nvim-lspconfig": { "branch": "master", "commit": "effe4bf2e1afb881ea67291c648b68dd3dfc927a" }, + "nvim-jdtls": { "branch": "master", "commit": "291dad797b5427ca0c9b7e0dd261279c7c3823e1" }, + "nvim-lspconfig": { "branch": "master", "commit": "3f58aeca0c6ece8a9fb8782ea3fcb6024f285be3" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "660861b1849256398f70450afdf93908d28dc945" }, + "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, - "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, + "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rustaceanvim": { "branch": "master", "commit": "88575b98bb9937fb9983ddec5e532b67e75ce677" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/lua/plugins/dap.lua b/lua/plugins/dap.lua index f1e3c56..dcfe2a1 100644 --- a/lua/plugins/dap.lua +++ b/lua/plugins/dap.lua @@ -1,37 +1,53 @@ return { - { - 'mfussenegger/nvim-dap', - lazy = true, - dependencies = { 'nvim-lua/plenary.nvim' }, - config = function() - local wk = require("which-key") - local dap = require("dap") - wk.add({ - { 'd', group = "dap" }, - { 'db', dap.toggle_breakpoint, desc = "Toggle breakpoint" }, - { 'dc', dap.continue, desc = "Launch/resume debug session" }, - { 'do', dap.step_over, desc = "Step over" }, - { 'di', dap.step_into, desc = "Step into" }, - { 'du', dap.step_out, desc = "Step out" }, - }) - end - }, - { - 'rcarriga/nvim-dap-ui', - lazy = true, - config = function() - local dapui = require("dapui") - dapui.setup() - local wk = require("which-key") - wk.add({ - { 'dd', dapui.toggle, desc = "Toggle dap ui" } - }) - end, - dependencies = { 'mfussenegger/nvim-dap', 'nvim-neotest/nvim-nio' } - }, - { - 'theHamsta/nvim-dap-virtual-text', - lazy = true, - config = true - } + { + 'mfussenegger/nvim-dap', + lazy = false, + dependencies = { 'nvim-lua/plenary.nvim' }, + config = function() + local wk = require("which-key") + local dap = require("dap") + wk.add({ + { 'd', group = "dap" }, + { 'db', dap.toggle_breakpoint, desc = "Toggle breakpoint" }, + { 'dc', dap.continue, desc = "Launch/resume debug session" }, + { 'do', dap.step_over, desc = "Step over" }, + { 'di', dap.step_into, desc = "Step into" }, + { 'du', dap.step_out, desc = "Step out" }, + }) + dap.adapters.codelldb = { + type = "executable", + command = "codelldb", + } + dap.configurations.cpp = { + { + name = "Launch file", + type = "codelldb", + request = "launch", + program = function() + return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/', 'file') + end, + cwd = '${workspaceFolder}', + stopOnEntry = false, + } + } + end + }, + { + 'rcarriga/nvim-dap-ui', + lazy = false, + config = function() + local dapui = require("dapui") + dapui.setup() + local wk = require("which-key") + wk.add({ + { 'dd', dapui.toggle, desc = "Toggle dap ui" } + }) + end, + dependencies = { 'mfussenegger/nvim-dap', 'nvim-neotest/nvim-nio' } + }, + { + 'theHamsta/nvim-dap-virtual-text', + lazy = true, + config = true + } } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 04ddf1b..4bae69c 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -176,6 +176,7 @@ return { vim.lsp.config('clangd', { capabilities = capabilities, on_attach = lsp_attach, + filetypes = { 'c', 'cpp', 'h' }, cmd = { "clangd", '--background-index', '--clang-tidy' } }) vim.lsp.enable({ 'ts_ls', 'vue_ls', 'clangd' })