current good

This commit is contained in:
2026-05-20 09:39:20 -06:00
parent cfdc17be3a
commit a07f128628
6 changed files with 584 additions and 164 deletions

View File

@@ -0,0 +1,122 @@
-- ============================================================
-- BUFFERLINE
-- Buffer tabs
-- ============================================================
local plugins = {
{
src = 'https://github.com/akinsho/bufferline.nvim',
version = vim.version.range '*',
},
}
if vim.g.have_nerd_font then table.insert(plugins, 'https://github.com/nvim-tree/nvim-web-devicons') end
vim.pack.add(plugins)
-- ============================================================
-- SETUP
-- ============================================================
require('bufferline').setup {
options = {
mode = 'buffers',
numbers = 'none',
close_command = 'bdelete! %d',
right_mouse_command = 'bdelete! %d',
left_mouse_command = 'buffer %d',
middle_mouse_command = nil,
indicator = {
style = 'underline',
},
buffer_close_icon = '󰅖',
modified_icon = '',
close_icon = '',
left_trunc_marker = '',
right_trunc_marker = '',
max_name_length = 24,
max_prefix_length = 18,
tab_size = 20,
diagnostics = 'nvim_lsp',
diagnostics_indicator = function(_, _, diagnostics_dict)
local s = ' '
for e, n in pairs(diagnostics_dict) do
local sym = e == 'error' and '' or (e == 'warning' and '') or ''
s = s .. n .. sym
end
return s
end,
offsets = {
{
filetype = 'neo-tree',
text = 'File Explorer',
highlight = 'Directory',
text_align = 'left',
},
},
show_buffer_icons = true,
show_buffer_close_icons = false,
show_close_icon = false,
show_tab_indicators = true,
persist_buffer_sort = true,
separator_style = 'slant',
enforce_regular_tabs = false,
always_show_bufferline = true,
hover = {
enabled = true,
delay = 200,
reveal = { 'close' },
},
},
}
-- ============================================================
-- KEYMAPS
-- ============================================================
-- Next buffer
vim.keymap.set('n', '<Tab>', '<Cmd>BufferLineCycleNext<CR>', {
desc = 'Next Buffer',
silent = true,
})
-- Previous buffer
vim.keymap.set('n', '<S-Tab>', '<Cmd>BufferLineCyclePrev<CR>', {
desc = 'Previous Buffer',
silent = true,
})
-- Pin buffer
vim.keymap.set('n', '<leader>bp', '<Cmd>BufferLineTogglePin<CR>', {
desc = 'Pin Buffer',
silent = true,
})
-- Close buffer
vim.keymap.set('n', '<leader>bc', '<Cmd>bdelete<CR>', {
desc = 'Close Buffer',
silent = true,
})
-- Go to buffer by number
for i = 1, 9 do
vim.keymap.set('n', '<leader>' .. i, function() require('bufferline').go_to(i, true) end, {
desc = 'Go to buffer ' .. i,
silent = true,
})
end

View File

@@ -0,0 +1,104 @@
-- ============================================================
-- LUALINE
-- Statusline
-- ============================================================
vim.pack.add {
{
src = 'https://github.com/nvim-lualine/lualine.nvim',
},
{
src = 'https://github.com/nvim-tree/nvim-web-devicons',
},
}
require('lualine').setup {
options = {
theme = 'onedark',
icons_enabled = true,
component_separators = {
left = '',
right = '',
},
section_separators = {
left = '',
right = '',
},
disabled_filetypes = {
statusline = {},
winbar = {},
},
ignore_focus = {},
always_divide_middle = true,
globalstatus = true,
refresh = {
statusline = 100,
tabline = 100,
winbar = 100,
},
},
sections = {
lualine_a = { {
'mode',
upper = true,
} },
lualine_b = {
'branch',
'diff',
'diagnostics',
},
lualine_c = {
{
'filename',
path = 1,
},
},
lualine_x = {
{
'encoding',
show_bomb = true,
},
'fileformat',
'filetype',
},
lualine_y = {
'progress',
},
lualine_z = {
'location',
},
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = { 'filename' },
lualine_x = { 'location' },
lualine_y = {},
lualine_z = {},
},
extensions = {
'trouble',
'quickfix',
'fzf',
'lazy',
'mason',
},
}

View File

@@ -0,0 +1,65 @@
-- ============================================================
-- TOGGLETERM
-- Floating terminal
-- ============================================================
vim.pack.add {
{
src = 'https://github.com/akinsho/toggleterm.nvim',
version = vim.version.range '*',
},
}
require('toggleterm').setup {
size = 20,
open_mapping = [[<leader>tt]],
hide_numbers = true,
shade_filetypes = {},
shade_terminals = true,
start_in_insert = true,
insert_mappings = true,
terminal_mappings = true,
persist_size = true,
persist_mode = true,
direction = 'float',
close_on_exit = true,
shell = vim.o.shell,
float_opts = {
border = 'rounded',
winblend = 0,
},
}
-- ============================================================
-- TERMINAL KEYMAPS
-- ============================================================
vim.api.nvim_create_autocmd('TermOpen', {
pattern = 'term://*',
callback = function()
local opts = { buffer = 0 }
-- ESC exits terminal insert mode
vim.keymap.set('t', '<Esc>', [[<C-\><C-n>]], opts)
-- Better window navigation
vim.keymap.set('t', '<C-h>', [[<Cmd>wincmd h<CR>]], opts)
vim.keymap.set('t', '<C-j>', [[<Cmd>wincmd j<CR>]], opts)
vim.keymap.set('t', '<C-k>', [[<Cmd>wincmd k<CR>]], opts)
vim.keymap.set('t', '<C-l>', [[<Cmd>wincmd l<CR>]], opts)
end,
})

View File

@@ -0,0 +1,67 @@
-- ============================================================
-- TROUBLE.NVIM
-- Better diagnostics / references / quickfix UI
-- ============================================================
vim.pack.add {
{
src = 'https://github.com/folke/trouble.nvim',
},
}
require('trouble').setup {
auto_close = false,
auto_open = false,
auto_preview = true,
focus = true,
modes = {
diagnostics = {
auto_open = false,
},
},
icons = {
indent = {
top = '',
middle = '├╴',
last = '└╴',
fold_open = '',
fold_closed = '',
ws = ' ',
},
},
}
local trouble = require 'trouble'
-- ============================================================
-- KEYMAPS
-- ============================================================
-- General diagnostics
vim.keymap.set('n', '<leader>xx', function() trouble.toggle 'diagnostics' end, { desc = 'Trouble: Diagnostics' })
-- Workspace diagnostics
vim.keymap.set('n', '<leader>xw', function() trouble.toggle 'workspace_diagnostics' end, { desc = 'Trouble: Workspace Diagnostics' })
-- Current buffer diagnostics
vim.keymap.set('n', '<leader>xd', function() trouble.toggle 'document_diagnostics' end, { desc = 'Trouble: Document Diagnostics' })
-- Quickfix
vim.keymap.set('n', '<leader>xq', function() trouble.toggle 'quickfix' end, { desc = 'Trouble: Quickfix' })
-- Location list
vim.keymap.set('n', '<leader>xl', function() trouble.toggle 'loclist' end, { desc = 'Trouble: Location List' })
-- LSP references
vim.keymap.set('n', 'gr', function() trouble.toggle 'lsp_references' end, { desc = 'Trouble: References' })
-- Symbols
vim.keymap.set('n', '<leader>xs', function() trouble.toggle 'symbols' end, { desc = 'Trouble: Symbols' })
-- Toggle previous/next diagnostics
vim.keymap.set('n', '[x', function() trouble.prev { skip_groups = true, jump = true } end, { desc = 'Previous Trouble Item' })
vim.keymap.set('n', ']x', function() trouble.next { skip_groups = true, jump = true } end, { desc = 'Next Trouble Item' })