Aeth3r/nvim
Public Access
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://git.aeth3r.rip:3001/Aeth3r/nvim

Browse Source
This commit is contained in:
Ubuntu committed 2026-10-29 18:52:28 +00:00
2 parents e33c310517 e5f6d0d9a4
commit 9a61068185
11 files changed
+485 -54
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

lua/config/keymaps.lua
+34 -3
View File
@@ -5,6 +5,22 @@ vim.keymap.set({"n", "v"}, "<C-j>", "18j", {desc = "Fast scroll down"})
vim.keymap.set({"n", "v"}, "<C-k>", "18k", {desc = "Fast scroll up"})
vim.keymap.set("n", "<Leader>h", "<cmd>:noh<CR>", {desc = "Remove current highlighting"})
-- Exit terminal mode easily with Escape
vim.keymap.set('t', '<Esc>', [[<C-\><C-n>]], { desc = 'Exit terminal mode' })
-- In lazygit, keep every key inside the terminal so only Ctrl+C (handled by
-- lazygit itself) can close it -- no nvim key drops you into normal mode.
vim.api.nvim_create_autocmd("TermOpen", {
callback = function()
if vim.fn.expand("%"):match("lazygit") then
-- let <Esc> pass through to lazygit instead of exiting terminal mode
vim.keymap.set('t', '<Esc>', '<Esc>', { buffer = true })
-- disable the built-in exit-terminal-mode chord
vim.keymap.set('t', [[<C-\><C-n>]], '<nop>', { buffer = true })
end
end,
})
vim.keymap.set("v", "<Leader>y", '"+y', {desc='Yank to "+ register for external copy/paste'})
--CODE/LSP
@@ -41,9 +57,24 @@ vim.keymap.set("n", "<Leader>f", "<cmd>:lua require('conform').format()<CR>")
local status_ok, dap = pcall(require, "dap")
if status_ok then
vim.keymap.set("n", "<leader>cdb", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" })
vim.keymap.set("n", "<leader>cdc", dap.continue, { desc = "Debug: Start/Continue" })
--vim.keymap.set("n", "<leader>cdc", dap.continue, { desc = "Debug: Start/Continue" })
-- new start debug keymap in debugger.lua
vim.keymap.set("n", "<leader>cdi", dap.step_into, { desc = "Debug: Step Into" })
vim.keymap.set("n", "<leader>cdo", dap.step_over, { desc = "Debug: Step Over" })
vim.keymap.set("n", "<leader>cdO", dap.step_out, { desc = "Debug: Step Out" })
vim.keymap.set("n", "<leader>cdn", dap.step_over, { desc = "Debug: Step Over" })
vim.keymap.set("n", "<leader>cdO", dap.step_out, { desc = "Debug: Step Out" })
vim.keymap.set("n", "<leader>cdt", dap.terminate, { desc = "Debug: Terminate" })
vim.keymap.set("n", "<leader>cdr", dap.restart, { desc = "Debug: Restart" })
vim.keymap.set("n", "<leader>cdp", dap.pause, { desc = "Debug: Pause" })
vim.keymap.set("n", "<leader>cd[", dap.up, { desc = "Debug: Callstack up" })
vim.keymap.set("n", "<leader>cd]", dap.down, { desc = "Debug: Callstack down" })
vim.keymap.set("n", "<leader>cdh", function()
require("dap.ui.widgets").hover()
end, { desc = "DAP: Hover Variable Value" })
vim.keymap.set("n", "<leader>cdu", function()
require("dapui").toggle()
end, { desc = "Debug: Toggle UI" })
vim.keymap.set("n", "<leader>cdw", function()
require("dapui").elements.watches.add(vim.fn.expand("<cword>"))
end, { desc = "DAP Add Watch under cursor" })
end
lua/config/lazy.lua
+3
View File
@@ -45,6 +45,9 @@ require("lazy").setup({
})
vim.cmd("colorscheme " .. colScheme.name);
vim.api.nvim_set_hl(0, "alphaheader", {fg = "#3661cf" })
if (colScheme.name == "rose-pine") then
vim.api.nvim_set_hl(0, "NotifyBackground", { bg = "#232136" })
end
--setup colour indents
local highlight = {
lua/ignoreConfig/colourConfig.lua.example
+33 -2
View File
@@ -1,6 +1,37 @@
local everforest = {
transparent = 0,--0, 1 or 2, least to most transparent
}
local kanagawa = {
transparent = true,
}
local marterial = {
disable = {
background = true,
}
}
local rosepine = {
styles = {
transparency = true,
}
}
local gruvbox = {
transparent = 1,
}
local opts = {
name = "everforest",
transparent = 0
name = "rose-pine",
opts = {
everforest=everforest,
kanagawa=kanagawa,
marterial=material,
rosepine=rosepine,
gruvbox=gruvbox,
}
}
return opts
lua/plugins/colourscheme.lua
+12 -9
View File
@@ -10,7 +10,7 @@ local material = {
--vim.g.material_style = "palenight"
material.setup({
lualine_style = "default", -- Lualine style ( can be 'stealth' or 'default' )
disable = ignores[1],
disable = ignores.opts.material.disable,
custom_highlights = {
Comment = { fg = "#b7b0bf" },
LineNr = { fg = "#b7b0bf" },
@@ -54,7 +54,7 @@ local kanagawa = {
theme = "lotus",
compile = true,
commentStyle = { italic = true },
transparent = ignores.transparent,
transparent = ignores.opts.kanagawa.transparent,
colors = {
--palette = {
-- -- change all usages of these colors
@@ -96,7 +96,7 @@ local everforest = {
local ignore = require('ignoreConfig.colourConfig');
everforest.setup({
background = "hard",
transparent_background_level = ignore.transparent,
transparent_background_level = ignore.opts.everforest.transparent,
italics = true,
});
@@ -113,17 +113,18 @@ local rosepine = {
lazy = true,
config = function()
local rosepine = require("rose-pine");
local ignore = require('ignoreConfig.colourConfig');
rosepine.setup({
variant = "moon", -- Options: "main", "moon", "dawn"
dark_variant = "moon",
bold_vert_split = false,
dim_nc_background = false,
disable_background = false,
disable_float_background = false,
disable_italics = false,
styles = {
bold = true,
italic = true,
transparency = ignore.opts.rosepine.styles.transparency,
},
groups = {
background = "base",
--background = "base",
panel = "surface",
border = "highlight_low",
comment = "muted",
@@ -299,8 +300,10 @@ local gruvbox = {
lazy = false,
priority = 1000,
config = function()
local ignores = require('ignoreConfig.colourConfig')
-- Optionally configure and load the colorscheme
-- directly inside the plugin declaration.
vim.g.gruvbox_material_transparent_background = ignores.opts.gruvbox.transparent
vim.g.gruvbox_material_enable_italic = true
--vim.cmd.colorscheme('gruvbox-material')
end
lua/plugins/debugger.lua
+288 -20
View File
@@ -1,3 +1,112 @@
local function fzf_pick_executable()
return coroutine.create(function(coro)
local current_cwd = vim.fn.getcwd():gsub("\\", "/")
require("fzf-lua").files({
cwd = current_cwd,
cmd = "fd --type x --hidden --no-ignore",
previewer = false,
header = false,
prompt = "Select Executable ❯ ",
winopts = {
title = " Select Executable ",
title_pos = "center",
height = 0.40,
width = 0.60,
},
actions = {
["default"] = function(selected)
if selected and selected[1] then
-- 1. Strip icons and formatting spaces to isolate the file string
local entry = require("fzf-lua.path").entry_to_file(selected[1], { cwd = current_cwd })
-- 2. Automatically resolve it to an absolute path (handles relative or absolute safely)
local full_path = vim.fn.fnamemodify(entry.path, ":p")
-- 3. Clean up slashes and hand it to DAP
coroutine.resume(coro, full_path:gsub("\\", "/"))
else
coroutine.resume(coro, vim.fn.empty())
end
end
}
})
end)
end
local function start_debug_session()
local is_windows = vim.fn.has("win32") == 1
local dap = require("dap")
-- 3. Platform-agnostic Launcher Configuration
if not is_windows then
dap.configurations.cpp = {
{
name = "Launch file",
type = "codelldb",
request = "launch",
program = fzf_pick_executable,
cwd = '${workspaceFolder}',
stopOnEntry = false,
args = {},
},
}
else
local vscode = require('dap.ext.vscode')
local launch_json = vim.fn.getcwd() .. "/.vscode/launch.json"
if vim.fn.filereadable(launch_json) == 1 then
dap.configurations.cpp = {}
dap.configurations.c = {}
-- 1. CRUCIAL FIX: Alias the adapters directly so nvim-dap doesn't complain about a missing engine
--if dap.adapters.cppdbg then
-- dap.adapters.cppvsdbg = dap.adapters.cppdbg
--elseif dap.adapters.codelldb then
-- dap.adapters.cppvsdbg = dap.adapters.codelldb
--end
-- 2. Map types inside launch.json to your C++ filetypes
vscode.type_to_filetypes = {
cppvsdbg = { "cpp", "c" },
cppdbg = { "cpp", "c" },
codelldb = { "cpp", "c" },
}
else
-- No launch.json exists. Re-inject your FZF picker template rules
dap.configurations.cpp = {
{
name = "Launch file",
type = "cppdbg",
request = "launch",
program = fzf_pick_executable,
cwd = "${workspaceFolder}",
stopOnEntry = false,
-- Crucial configurations for Microsoft cpptools:
-- On Windows, this automatically uses MinGW/MSVC underlying debugger engines
MIMode = is_windows and "gdb" or "lldb",
miDebuggerPath = is_windows and "gdb.exe" or nil, -- Uses system path for gdb on Windows
setupCommands = {
{
text = "-enable-pretty-printing",
description = "enable pretty printing",
ignoreFailures = false,
},
},
},
}
end
end
dap.continue()
end
vim.keymap.set("n", "<leader>cdc", start_debug_session, { desc = "Debug: Start/Continue with Smart Config" })
return {
"mfussenegger/nvim-dap",
dependencies = {
@@ -15,48 +124,207 @@ return {
dapui.setup()
require("nvim-dap-virtual-text").setup()
-- The dap-ui "disconnect" control (the plug icon) and dap.disconnect in
-- general send a DAP `disconnect` request. With the codelldb server
-- adapter that path crashes the adapter
-- (STATUS_ACCESS_VIOLATION / 0xC0000005, see dap.log) while the inferior
-- is still attached, and on Windows that takes Neovim down with it.
--
-- The `terminate` request path (the square Stop button / <leader>cdt)
-- tears the inferior down cleanly first, so codelldb's crash on the way
-- out is harmless. Route the disconnect control through terminate too.
-- (_G._dapui is created when dapui.controls is required; force-load it so
-- the override is in place before the controls winbar renders.)
require("dapui.controls")
_G._dapui.disconnect = function()
dap.terminate()
end
-- Automatically manage debugger installations via Mason
require("mason-nvim-dap").setup({
ensure_installed = { "codelldb" }, -- Auto-installs CodeLLDB
ensure_installed = { "codelldb", "cppdbg" }, -- Auto-installs CodeLLDB
automatic_installation = true,
})
-- Automatically open/close DAP UI panels
dap.listeners.after.event_initialized["dapui_config"] = function() dapui.open() end
dap.listeners.before.event_terminated["dapui_config"] = function() dapui.close() end
dap.listeners.before.event_exited["dapui_config"] = function() dapui.close() end
-- Defer the open so nvim-dap-ui's async (nio) element buffers are ready.
-- Opening synchronously from inside the DAP event listener races buffer
-- creation and throws "layout.lua: Invalid buffer id: -1".
dap.listeners.after.event_initialized["dapui_config"] = function()
vim.schedule(function() dapui.open() end)
end
dap.listeners.before.event_terminated["dapui_config"] = function()
vim.schedule(function() dapui.close() end)
end
dap.listeners.before.event_exited["dapui_config"] = function()
vim.schedule(function() dapui.close() end)
end
-- Step 2 & 3 configurations will go here...
-- Define the adapter connection
-- 1. Detect operating system
local is_windows = vim.fn.has("win32") == 1
local ext = is_windows and ".exe" or ""
-- 2. Platform-agnostic CodeLLDB Adapter setup
local mason_registry = require("mason-registry")
local codelldb = mason_registry.get_package("codelldb")
local extension_path = codelldb:get_install_path() .. "/extension/"
-- CodeLLDB executable is in different subfolders depending on Mason's package version
local codelldb_path = extension_path .. "adapter/codelldb" .. ext
local cpptools_pkg = mason_registry.get_package("cpptools")
local cpptools_path = cpptools_pkg:get_install_path()
.. "/extension/debugAdapters/bin/OpenDebugAD7"
.. ext
dap.adapters.codelldb = {
type = 'server',
port = "${port}",
executable = {
-- Adjust this path if Mason uses a different default location on your OS
command = vim.fn.stdpath("data") .. "/mason/bin/codelldb",
command = codelldb_path,
args = {"--port", "${port}"},
-- Keep the spawned server (and any inferior it launches) off
-- Neovim's console group so terminating a session can't take
-- Neovim down on Windows. Matches the cppvsdbg adapter above.
detached = true,
}
}
-- Configure C++ configurations
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,
args = {},
dap.adapters.cppdbg = {
id = "cppdbg",
type = "executable",
command = cpptools_path,
-- Must stay detached (the default) so the adapter + gdb + debuggee
-- run in their own process group. With detached=false on Windows
-- they share Neovim's console group, so terminating the session
-- (dap.terminate) sends the Ctrl-C/terminate signal to Neovim too.
options = {
detached = true,
},
}
-- Re-use C++ configuration for C language
-- Route MSVC `cppvsdbg` launch configs (as VS/msbuild launch.json
-- generates) to codelldb. We deliberately do NOT use Microsoft's vsdbg:
-- its license permits use only within Visual Studio / VS Code. codelldb
-- is LLVM/LLDB-based (Apache-2.0) and has a native PDB reader, so it can
-- debug MSVC/msbuild binaries without that restriction.
--
-- codelldb is a TCP `server` adapter, so terminating/disconnecting
-- talks over a socket and can't broadcast a console CTRL event to
-- Neovim the way the gdb-backed cppdbg path does. detached=true keeps
-- the spawned server (and the inferior it launches) off Neovim's
-- console group too -- the original `detached = false` is what still
-- let a disconnect take Neovim down.
dap.adapters.cppvsdbg = {
type = "server",
port = "${port}",
executable = {
command = codelldb_path,
args = { "--port", "${port}" },
detached = true,
},
}
-- 3. Platform-agnostic Launcher Configuration
if not is_windows then
dap.configurations.cpp = {
{
name = "Launch file",
type = "codelldb",
request = "launch",
program = fzf_pick_executable,
cwd = '${workspaceFolder}',
stopOnEntry = false,
args = {},
},
}
else
dap.configurations.cpp = {
{
name = "Launch file",
type = "cppdbg",
request = "launch",
program = fzf_pick_executable,
cwd = "${workspaceFolder}",
stopOnEntry = false,
-- Crucial configurations for Microsoft cpptools:
-- On Windows, this automatically uses MinGW/MSVC underlying debugger engines
MIMode = is_windows and "gdb" or "lldb",
miDebuggerPath = is_windows and "gdb.exe" or nil, -- Uses system path for gdb on Windows
setupCommands = {
{
text = "-enable-pretty-printing",
description = "enable pretty printing",
ignoreFailures = false,
},
},
},
}
end
dap.configurations.c = dap.configurations.cpp
-- Unity (Mono soft debugger) via Unity's MIT-licensed vscode-unity-debug
-- adapter, extracted from its .vsix into stdpath("data")/unity-debug.
-- Avoids vstuc, whose license (like vsdbg's) is VS Code only.
--
-- UnityDebug.exe is patched by unity-debug/install.sh (see patch.cs there;
-- original kept as UnityDebug.exe.orig): stock, it only matches editor
-- processes named exactly "Unity"/"Unity Editor", but Unity Hub launches
-- the editor as "unityhub-unity-editor-<version>". The patch makes it a
-- case-insensitive "Unity" prefix match, covering both launch methods and
-- any version. Helper processes (UnityPackageManager, import workers...)
-- match too, so the adapter picks the real editor by the process_id in
-- EditorInstance.json -- which needs the config name to contain "Editor".
local unity_debug_exe = vim.fn.stdpath("data") .. "/unity-debug/extension/bin/UnityDebug.exe"
local unity_debug_install = vim.fn.stdpath("config") .. "/unity-debug/install.sh"
dap.adapters.unity = function(callback)
if vim.fn.filereadable(unity_debug_exe) == 0 then
vim.notify("Installing Unity debug adapter...")
local result = vim.system({ unity_debug_install }, { text = true }):wait()
if result.code ~= 0 then
vim.notify("Unity debug adapter install failed:\n" .. result.stderr, vim.log.levels.ERROR)
return
end
end
callback({
type = "executable",
command = "mono",
args = { unity_debug_exe },
-- The adapter strips the leading "/" from `path` (a Windows-ism)
-- before reading it, so run it from / for the now-relative path
-- to resolve.
options = { cwd = "/" },
})
end
-- Library/EditorInstance.json only exists while the editor is open; the
-- adapter reads the editor PID from it to derive the debugger port.
-- The Unity project may sit in a repo subfolder, so search upward from
-- the buffer first, then downward from cwd.
local function unity_editor_instance()
local root = vim.fs.root(0, "ProjectSettings")
if root then
return root .. "/Library/EditorInstance.json"
end
local found = vim.fs.find("EditorInstance.json", { path = vim.fn.getcwd(), type = "file", limit = 1 })
return found[1]
end
dap.configurations.cs = {
{
name = "Unity Editor",
type = "unity",
request = "launch", -- unity-debug attaches to the running editor despite "launch"
path = unity_editor_instance,
},
}
end
}
lua/plugins/nvim-treesitter.lua
+24
View File
@@ -20,5 +20,29 @@ return {
sync_install = false,
highlight = { enable = true },
indent = { enable = true },
-- Enable the textobjects extension
textobjects = {
move = {
enable = true,
set_jumps = true, -- Add jumps to the jumplist (:h jumplist)
goto_next_start = {
["]]"] = { query = "@function.outer", desc = "Next function definition start" },
["]c"] = { query = "@class.outer", desc = "Next class definition start" },
},
goto_previous_start = {
["[["] = { query = "@function.outer", desc = "Previous function definition start" },
["[c"] = { query = "@class.outer", desc = "Previous class definition start" },
},
goto_next_end = {
["]f"] = { query = "@function.outer", desc = "Next function definition end" },
},
goto_previous_end = {
["[f"] = { query = "@function.outer", desc = "Previous function definition end" },
},
},
},
},
}
lua/pluginsLate/alpha.lua
-3
View File
@@ -38,9 +38,6 @@ return {
dashboard.button("l", " Lazy settings", ":Lazy<cr>"),
dashboard.button("q", "󰅚 quit nvim", ":qa<cr>"),
}
local handle = io.popen('fortune')
local fortune = handle:read("*a")
handle:close()
dashboard.section.footer.val = {
[["we define the boundaries of reality;]],
[[they don't define us."]],