jiriks74/nix.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(plugin/overseer,dap): Overseer not loading, simplify DAP config (a bit)
Some checks failed
Perform checks / formatting (push) Successful in 43s
Details
Perform checks / nix_flake_check (push) Successful in 48s
Details
Perform checks / nix_build (push) Failing after 19s
Details

Browse Source
This commit is contained in:
Jiří Štefka 2024-12-03 03:12:40 +01:00
parent 3fd70395b5
commit a0aae4711d
Signed by: jiriks74
GPG Key ID: 1D5E30D3DB2264DE
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nvim/ftplugin/c.lua
View File

@ -11,10 +11,12 @@ local root_files = {
'.git', '.git',
} }
local root = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1])
vim.lsp.start { vim.lsp.start {
name = 'clangd', name = 'clangd',
cmd = { 'clangd' }, cmd = { 'clangd' },
root_dir = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]), root_dir = root,
capabilities = require('user.lsp').make_client_capabilities(), capabilities = require('user.lsp').make_client_capabilities(),
filetypes = { "c" }, filetypes = { "c" },
on_attach = function(client, bufnr) on_attach = function(client, bufnr)
@ -39,7 +41,7 @@ if vim.fn.executable('gdb') == 1 then
end end
-- DAP loads this automatically as of now. May be needed to load the debugger for asm? -- DAP loads this automatically as of now. May be needed to load the debugger for asm?
-- if require('user.file_exists').file_exists(vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]) .. "/.vscode/launch.json") then -- if require('user.file_exists').file_exists(root .. "/.vscode/launch.json") then
-- require("dap.ext.vscode").load_launchjs(nil, { cppdbg = { "c", "cpp", "asm" } }) -- require("dap.ext.vscode").load_launchjs(nil, { cppdbg = { "c", "cpp", "asm" } })
-- require("dap.ext.vscode").load_launchjs(nil, { gdb = { "c", "cpp", "asm" } }) -- require("dap.ext.vscode").load_launchjs(nil, { gdb = { "c", "cpp", "asm" } })
-- end -- end

6
nvim/plugin/overseer.lua
View File

@ -8,7 +8,7 @@ local file_exists = require("user.file_exists").file_exists
require("which-key").add({ require("which-key").add({
{ "<leader>o", group = "[o]verseer", icon = "" }, { "<leader>o", group = "[o]verseer", icon = "" },
{ "<leader>ot", "<Cmd>OverseerToggle<CR>", desc = "[o]verseer: [t]oggle " }, { "<leader>ot", "<Cmd>OverseerToggle<CR>", desc = "[o]verseer: [t]oggle " },
{ "<leader>oc", "<Cmd>OverseerRunCmd<CR>", desc = "[o]verseer: run [c]ommand" }, { "<leader>oc", "<Cmd>OverseerRunCmd<CR>", desc = "[o]verseer: run [c]ommand" },
{ "<leader>or", "<Cmd>OverseerRun<CR>", desc = "[o]verseer: [r]un task" }, { "<leader>or", "<Cmd>OverseerRun<CR>", desc = "[o]verseer: [r]un task" },
{ "<leader>oq", "<Cmd>OverseerQuickAction<CR>", desc = "[o]verseer: [q]uick action" }, { "<leader>oq", "<Cmd>OverseerQuickAction<CR>", desc = "[o]verseer: [q]uick action" },
{ "<leader>oa", "<Cmd>OverseerTaskAction<CR>", desc = "[o]verseer: task [a]ction" }, { "<leader>oa", "<Cmd>OverseerTaskAction<CR>", desc = "[o]verseer: task [a]ction" },
@ -20,10 +20,10 @@ local root_files = {
'.git', '.git',
} }
local root = vim.fs.find(root_files, { upward = true })[1] local root = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1])
if root then if root then
if file_exists(root .. ".vscode/tasks.json") then if file_exists(root .. "/.vscode/tasks.json") then
require('overseer').setup({ require('overseer').setup({
strategy = { strategy = {
"toggleterm", "toggleterm",