diff --git a/lua/plugins/python.lua b/lua/plugins/python.lua index f4619b6..01d5dd7 100644 --- a/lua/plugins/python.lua +++ b/lua/plugins/python.lua @@ -1,57 +1,56 @@ local M = {} +local nvim_dap = { + "mfussenegger/nvim-dap", + event = "BufReadPre", + dependencies = { + "rcarriga/nvim-dap-ui", + "theHamsta/nvim-dap-virtual-text", + "nvim-neotest/nvim-nio", + "williamboman/mason.nvim", + "jay-babu/mason-nvim-dap.nvim", + "mfussenegger/nvim-dap-python", + }, + config = function() + require("nvim-dap-virtual-text").setup({ + virt_text_pos = "eol", + commented = true, + }) + local dap_python = require("dap-python") + + require("mason-nvim-dap").setup({ + automatic_installation = true, + automatic_setup = true, + handlers = {}, + ensure_installed = { "python" }, + }) + local mason_path = vim.fn.glob(vim.fn.stdpath("data") .. "/mason/") + local debugpy_path = mason_path .. "packages/debugpy/venv/Scripts/python" + + dap_python.setup(debugpy_path) + dap_python.default_port = 38000 + + require("user.dapui") + end, + keys = { + { "d", "", desc = "  Debug" }, + { "dt", "lua require'dap'.toggle_breakpoint()", desc = "Toggle Breakpoint" }, + { "db", "lua require'dap'.step_back()", desc = "Step Back" }, + { "dc", "lua require'dap'.continue()", desc = "Continue" }, + { "dC", "lua require'dap'.run_to_cursor()", desc = "Run To Cursor" }, + { "dd", "lua require'dap'.disconnect()", desc = "Disconnect" }, + { "dg", "lua require'dap'.session()", desc = "Get Session" }, + { "di", "lua require'dap'.step_into()", desc = "Step Into" }, + { "do", "lua require'dap'.step_over()", desc = "Step Over" }, + { "du", "lua require'dap'.step_out()", desc = "Step Out" }, + { "dp", "lua require'dap'.pause()", desc = "Pause" }, + { "dr", "lua require'dap'.repl.toggle()", desc = "Toggle Repl" }, + { "ds", "lua require'dap'.continue()", desc = "Start" }, + { "dq", "lua require'dap'.close()", desc = "Quit" }, + { "dU", "lua require'dapui'.toggle({reset = true})", desc = "Toggle UI" }, + }, +} if pcode.active_python_config then M = { - { - "mfussenegger/nvim-dap", - event = "BufReadPre", - enabled = vim.fn.has("win32") == 1, - dependencies = { - "rcarriga/nvim-dap-ui", - "theHamsta/nvim-dap-virtual-text", - "nvim-neotest/nvim-nio", - "williamboman/mason.nvim", - "jay-babu/mason-nvim-dap.nvim", - "mfussenegger/nvim-dap-python", - }, - config = function() - require("nvim-dap-virtual-text").setup({ - virt_text_pos = "eol", - commented = true, - }) - local dap_python = require("dap-python") - - require("mason-nvim-dap").setup({ - automatic_installation = true, - automatic_setup = true, - handlers = {}, - ensure_installed = { "python" }, - }) - local mason_path = vim.fn.glob(vim.fn.stdpath("data") .. "/mason/") - local debugpy_path = mason_path .. "packages/debugpy/venv/Scripts/python" - - dap_python.setup(debugpy_path) - dap_python.default_port = 38000 - - require("user.dapui") - end, - keys = { - { "d", "", desc = "  Debug" }, - { "dt", "lua require'dap'.toggle_breakpoint()", desc = "Toggle Breakpoint" }, - { "db", "lua require'dap'.step_back()", desc = "Step Back" }, - { "dc", "lua require'dap'.continue()", desc = "Continue" }, - { "dC", "lua require'dap'.run_to_cursor()", desc = "Run To Cursor" }, - { "dd", "lua require'dap'.disconnect()", desc = "Disconnect" }, - { "dg", "lua require'dap'.session()", desc = "Get Session" }, - { "di", "lua require'dap'.step_into()", desc = "Step Into" }, - { "do", "lua require'dap'.step_over()", desc = "Step Over" }, - { "du", "lua require'dap'.step_out()", desc = "Step Out" }, - { "dp", "lua require'dap'.pause()", desc = "Pause" }, - { "dr", "lua require'dap'.repl.toggle()", desc = "Toggle Repl" }, - { "ds", "lua require'dap'.continue()", desc = "Start" }, - { "dq", "lua require'dap'.close()", desc = "Quit" }, - { "dU", "lua require'dapui'.toggle({reset = true})", desc = "Toggle UI" }, - }, - }, -- https://github.com/nvim-neotest/neotest-python -- https://docs.pytest.org/en/7.1.x/getting-started.html { @@ -92,5 +91,8 @@ if pcode.active_python_config then }, }, } + if vim.fn.has("win32") ~= 0 then + table.insert(M, nvim_dap) + end end return M diff --git a/lua/plugins/themes/_globalvar.lua b/lua/plugins/themes/_globalvar.lua index ecca80a..d8a73fc 100644 --- a/lua/plugins/themes/_globalvar.lua +++ b/lua/plugins/themes/_globalvar.lua @@ -70,7 +70,7 @@ if pcode.active_python_config then table.insert(pcode.mason_ensure_installed, "pyright") table.insert(pcode.null_ls_ensure_installed, "flake8") table.insert(pcode.null_ls_ensure_installed, "black") - if vim.fn.has("win32") == 0 then + if vim.fn.has("win32") ~= 1 then pcode.nvim_dap = true end end