diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua b/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua index 9c7f5f4..4578532 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/appearance.lua @@ -1,61 +1,61 @@ -return {{ - "nvim-lualine/lualine.nvim", - requires = { "kyazdani42/nvim-web-devicons" }, - dependencies = { - "stevearc/dressing.nvim", - "norcalli/nvim-colorizer.lua", - "rktjmp/lush.nvim", - "zaldih/themery.nvim", - - }, - config = function() - require("lualine").setup { - options = { - theme = "auto", - component_separators = "", - section_separators = "", - }, - sections = { - lualine_a = { "mode" }, - lualine_b = {}, - lualine_c = { "filename" }, - lualine_x = {}, - lualine_y = {}, - lualine_z = { - function() - return "[" .. vim.bo.filetype .. "]" - end, - }, - }, - } - require("colorizer").setup { - "*", - css = { rgb_fn = true }, - } - require("dressing").setup { - select = { - backend = { "nui", "telescope", "builtin" }, - }, - } - require("themery").setup { - themes = { - "aquarium", - "vague", - "catppuccin-mocha", - "gruvbox", - "catppuccin-frappe", - "catppuccin-macchiato", - "nord", - "rose-pine", - "tokyonight", - "bluloco-dark", - }, - livePreview = true, - } - end, -}, +return { { - -- themes + "nvim-lualine/lualine.nvim", + requires = { "kyazdani42/nvim-web-devicons" }, + dependencies = { + "stevearc/dressing.nvim", + "norcalli/nvim-colorizer.lua", + "rktjmp/lush.nvim", + "zaldih/themery.nvim", + }, + config = function() + require("lualine").setup { + options = { + theme = "auto", + component_separators = "", + section_separators = "", + }, + sections = { + lualine_a = { "mode" }, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = {}, + lualine_y = {}, + lualine_z = { + function() + return "[" .. vim.bo.filetype .. "]" + end, + }, + }, + } + require("colorizer").setup { + "*", + css = { rgb_fn = true }, + } + require("dressing").setup { + select = { + backend = { "nui", "telescope", "builtin" }, + }, + } + require("themery").setup { + themes = { + "aquarium", + "vague", + "catppuccin-mocha", + "gruvbox", + "catppuccin-frappe", + "catppuccin-macchiato", + "nord", + "rose-pine", + "tokyonight", + "bluloco-dark", + }, + livePreview = true, + } + end, + }, + { + -- themes "FrenzyExists/aquarium-vim", "vague2k/vague.nvim", "catppuccin/nvim", @@ -64,5 +64,5 @@ return {{ "rose-pine/neovim", "folke/tokyonight.nvim", "uloco/bluloco.nvim", - } + }, } diff --git a/nvim/.config/nvim/lua/vxclutch/lazy/dap.lua b/nvim/.config/nvim/lua/vxclutch/lazy/dap.lua index f95b322..e80dcf2 100644 --- a/nvim/.config/nvim/lua/vxclutch/lazy/dap.lua +++ b/nvim/.config/nvim/lua/vxclutch/lazy/dap.lua @@ -1,61 +1,83 @@ return { - { - "mfussenegger/nvim-dap", - dependencies = { - "leoluz/nvim-dap-go", - "rcarriga/nvim-dap-ui", - "nvim-neotest/nvim-nio", - "williamboman/mason.nvim", - "julianolf/nvim-dap-lldb", - "mfussenegger/nvim-python-dap", - }, - config = function() - local dap = require("dap") - local ui = require("dapui") + { + "mfussenegger/nvim-dap", + dependencies = { + "leoluz/nvim-dap-go", + "rcarriga/nvim-dap-ui", + "nvim-neotest/nvim-nio", + "williamboman/mason.nvim", + "julianolf/nvim-dap-lldb", + "mfussenegger/nvim-dap-python", + }, + config = function() + local dap = require "dap" + local ui = require "dapui" - require("dapui").setup() - require("dap-go").setup() - require("dap-python").setup() - require("dap-lldb").setup() + require("dapui").setup() + require("dap-go").setup() + require("dap-python").setup() + require("dap-lldb").setup() + -- Handled by nvim-dap-go + -- dap.adapters.go = { + -- type = "server", + -- port = "${port}", + -- executable = { + -- command = "dlv", + -- args = { "dap", "-l", "127.0.0.1:${port}" }, + -- }, + -- } - -- Handled by nvim-dap-go - -- dap.adapters.go = { - -- type = "server", - -- port = "${port}", - -- executable = { - -- command = "dlv", - -- args = { "dap", "-l", "127.0.0.1:${port}" }, - -- }, - -- } + dap.adapters.lldb = { + type = "executable", + command = "/usr/bin/lldb", -- Adjust path if necessary + name = "lldb", + } - vim.keymap.set("n", "b", dap.toggle_breakpoint) - vim.keymap.set("n", "gb", dap.run_to_cursor) + dap.configurations.cpp = { + { + name = "Launch", + type = "lldb", + request = "launch", + program = function() + return vim.fn.input("Path to executable: ", vim.fn.getcwd() .. "/", "file") + end, + cwd = "${workspaceFolder}", + stopOnEntry = false, + args = {}, + runInTerminal = false, + }, + } + dap.configurations.c = dap.configurations.cpp + dap.configurations.rust = dap.configurations.cpp - -- Eval var under cursor - vim.keymap.set("n", "?", function() - require("dapui").eval(nil, { enter = true }) - end) + vim.keymap.set("n", "b", dap.toggle_breakpoint) + vim.keymap.set("n", "gb", dap.run_to_cursor) - vim.keymap.set("n", "dc", dap.continue) - vim.keymap.set("n", "s", dap.step_into) - vim.keymap.set("n", "n", dap.step_over) - vim.keymap.set("n", "do", dap.step_out) - vim.keymap.set("n", "db", dap.step_back) - vim.keymap.set("n", "dr", dap.restart) + -- Eval var under cursor + vim.keymap.set("n", "?", function() + require("dapui").eval(nil, { enter = true }) + end) - dap.listeners.before.attach.dapui_config = function() - ui.open() - end - dap.listeners.before.launch.dapui_config = function() - ui.open() - end - dap.listeners.before.event_terminated.dapui_config = function() - ui.close() - end - dap.listeners.before.event_exited.dapui_config = function() - ui.close() - end - end, - }, + vim.keymap.set("n", "dc", dap.continue) + vim.keymap.set("n", "s", dap.step_into) + vim.keymap.set("n", "n", dap.step_over) + vim.keymap.set("n", "do", dap.step_out) + vim.keymap.set("n", "db", dap.step_back) + vim.keymap.set("n", "dr", dap.restart) + + dap.listeners.before.attach.dapui_config = function() + ui.open() + end + dap.listeners.before.launch.dapui_config = function() + ui.open() + end + dap.listeners.before.event_terminated.dapui_config = function() + ui.close() + end + dap.listeners.before.event_exited.dapui_config = function() + ui.close() + end + end, + }, }