diff --git a/lazy-lock.json b/lazy-lock.json index e3b85ac..33866e8 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -22,7 +22,6 @@ "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "5b388c0de30f1605671ebfb9a20a620cda50ffce" }, "mason-null-ls.nvim": { "branch": "main", "commit": "93946aef86b1409958c97ee5feaf30bdd1053e24" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "a775db8ac7c468fb05fcf67069961dba0d7feb56" }, "mason.nvim": { "branch": "main", "commit": "c2002d7a6b5a72ba02388548cfaf420b864fbc12" }, "mini.ai": { "branch": "main", "commit": "14a1382372195573c6c7f494ab8bb298b03e6f04" }, "mini.comment": { "branch": "main", "commit": "e5294cc3e75bafb2369f235d31a98b01a9cc67ad" }, @@ -35,8 +34,6 @@ "nvim-autopairs": { "branch": "master", "commit": "4fc96c8f3df89b6d23e5092d31c866c53a346347" }, "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" }, "nvim-colorizer.lua": { "branch": "master", "commit": "760e27df4dd966607e8fb7fd8b6b93e3c7d2e193" }, - "nvim-dap": { "branch": "master", "commit": "700a3c7d6fbe5b07bee74e9952b456120d355c47" }, - "nvim-dap-ui": { "branch": "master", "commit": "1e21b3b50e67700e32285b5a74e645311fd8bbea" }, "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" }, "nvim-lspconfig": { "branch": "master", "commit": "f11fdff7e8b5b415e5ef1837bdcdd37ea6764dda" }, "nvim-navic": { "branch": "master", "commit": "7a2b823152fe4de65ee7925b0e32d26ed73bc57c" }, diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index dac4319..a202029 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -6,12 +6,14 @@ return { event = "BufWinEnter", module = "plenary", }, + -- color scheme { "folke/tokyonight.nvim", commit = "66bfc2e8f754869c7b651f3f47a2ee56ae557764", lazy = false, -- make sure we load this during startup if it is your main colorscheme priority = 1000, -- make sure to load this before all the other start plugins }, + -- dashboard { "goolord/alpha-nvim", commit = "0bb6fc0646bcd1cdb4639737a1cee8d6e08bcc31", @@ -369,10 +371,12 @@ return { -- debuging { "mfussenegger/nvim-dap", + enabled = vim.fn.has("win32") == 0, }, { "rcarriga/nvim-dap-ui", dependencies = "mfussenegger/nvim-dap", + enabled = vim.fn.has("win32") == 0, init = function() require("user.dapui") end, @@ -380,6 +384,7 @@ return { { "jayp0521/mason-nvim-dap.nvim", dependencies = { "williamboman/mason.nvim", "mfussenegger/nvim-dap" }, + enabled = vim.fn.has("win32") == 0, init = function() require("user.mason_dap") end, diff --git a/lua/user/dapui.lua b/lua/user/dapui.lua index 2382f5c..59fc6f3 100644 --- a/lua/user/dapui.lua +++ b/lua/user/dapui.lua @@ -1,4 +1,7 @@ -local dap, dapui = require("dap"), require("dapui") +local status_ok, dap, dapui = require("dap"), require("dapui") +if not status_ok then + return +end dap.listeners.after.event_initialized["dapui_config"] = function() dapui.open() end diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index 537b845..d0a3c87 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -91,7 +91,7 @@ local trn = "" if vim.fn.has("win32") then trn = "pwsh" end - +local is_dap = pcall(require, "nvim-dap") local mappings2 = { ["/"] = { "lua require('Comment.api').toggle.linewise(vim.fn.visualmode())", "Commet Block" }, } @@ -230,19 +230,31 @@ local mappings = { name = "Debug", b = { function() - require("dap").toggle_breakpoint() + if is_dap then + require("dap").toggle_breakpoint() + else + vim.notify("DAP Not Support", "error") + end end, "Toggle Breakpoint", }, B = { function() - require("dap").clear_breakpoints() + if is_dap then + require("dap").clear_breakpoints() + else + vim.notify("DAP Not Support", "error") + end end, "Clear Breakpoints", }, c = { function() - require("dap").continue() + if is_dap then + require("dap").continue() + else + vim.notify("DAP Not Support", "error") + end end, "Start/Continue", },