Compare commits

3 Commits

Author SHA1 Message Date
377aaf83cf feat: Starting the cleanup on DAP plugins and adding a basic statusline
to futz around with potential replacement of more external plugins.
2026-06-07 14:21:19 -05:00
e6e0ca0cca Merge branch 'main' into development 2026-06-07 14:20:56 -05:00
9f5007cbc3 feat: Adding the new FaultyBranches created note_taking plugin that may
take over for telekasten
2026-06-04 18:31:02 -05:00
4 changed files with 112 additions and 77 deletions

View File

@@ -1,6 +1,7 @@
-- Load the following plugins eagerly to prevent visual oddities -- Load the following plugins eagerly to prevent visual oddities
require('plugins.gruvbox') -- Colorscheme setup require('plugins.gruvbox') -- Colorscheme setup
require('plugins.lualine') -- Status line plugin require('plugins.lualine') -- Status line plugin
-- require('statusline')
-- vim.schedule defers plugin loading for after the main loop starts -- vim.schedule defers plugin loading for after the main loop starts
-- Startup is cleaner and faster than ever -- Startup is cleaner and faster than ever
@@ -24,8 +25,8 @@ vim.schedule(function()
}) })
require('nvim-autopairs').setup() -- Automatic pair completion of paranteticals, braces, quotes, etc. require('nvim-autopairs').setup() -- Automatic pair completion of paranteticals, braces, quotes, etc.
require('plugins.dap') -- DAP debugging plugin require('plugins.dap') -- DAP debugging plugin TODO: cleanup
require('plugins.dap-python') -- Debug plugin settings specifically for python require('plugins.dap-python') -- Debug plugin settings specifically for python TODO: cleanup
-- Experimental -- Experimental
-- require('plugins.note_taking') -- In house note taking plugin (TODO: rename once the plugin name is solidified) -- require('plugins.note_taking') -- In house note taking plugin (TODO: rename once the plugin name is solidified)

View File

@@ -5,6 +5,8 @@ vim.pack.add({
'https://github.com/theHamsta/nvim-dap-virtual-text', 'https://github.com/theHamsta/nvim-dap-virtual-text',
}) })
-- TODO: Needs a pass to remove hardcoding, potentially cut out mason completely and general cleanup
require('dapui').setup({ require('dapui').setup({
mappings = { mappings = {
open = 'o', open = 'o',
@@ -106,7 +108,7 @@ require('nvim-dap-virtual-text').setup()
name = 'Debug', name = 'Debug',
request = 'launch', request = 'launch',
program = function() program = function()
return vim.fn.getcwd() .. '/target/debug/faultybranches' return vim.fn.getcwd() .. '/target/debug/faultybranches' -- TODO: remove the testing hardcoded path
end, end,
stopAtBeginningOfMainSubprogram = true, stopAtBeginningOfMainSubprogram = true,
}, },

View File

@@ -0,0 +1,6 @@
vim.pack.add({
-- 'https://git.faultybranches.dev/FaultyBranches_Public/faultynotes.git'
'~/repos/code/faultynotes'
})
require('faultynotes').setup()

26
nvim/lua/statusline.lua Normal file
View File

@@ -0,0 +1,26 @@
local function lsp_status()
local attached_clients = vim.lsp.get_clients({ bufnr = 0 })
if #attached_clients == 0 then
return ''
end
local names = vim.iter(attached_clients)
:map(function (client)
local name = client.name:gsub('language.server', 'ls')
return name
end)
:totable()
return '[' .. table.concat(names, ', ') .. ']'
end
function _G.statusline()
return table.concat({
'%f',
'%h%w%m%r',
'%=',
lsp_status(),
' %-14(%l,%c%V%)',
'%P',
}, ' ')
end
vim.o.statusline = '%{%v:lua._G.statusline()%}'