style: ran stylua across entire project

main
Sofus Albert Høgsbro Rose 2025-02-13 09:04:17 +01:00
parent 79089250f6
commit 10643d0b4b
Signed by: so-rose
GPG Key ID: AD901CB0F3701434
38 changed files with 515 additions and 428 deletions

View File

@ -11,7 +11,7 @@ vim.g.maplocalleader = ' '
vim.g.have_nerd_font = true
-- [[ Remote Python ]]
local remote_python_path = vim.fn.stdpath("config") .. '/remote-python'
local remote_python_path = vim.fn.stdpath('config') .. '/remote-python'
vim.g.python3_host_prog = remote_python_path .. '/.venv/bin/python'
-- [[ Vim Options ]]

View File

@ -1,7 +1,7 @@
return {
cmd = { 'basedpyright-langserver', '--stdio' },
filetypes = { 'python' },
root_markers = { "pyproject.toml" },
root_markers = { 'pyproject.toml' },
settings = {
basedpyright = {
disableOrganizeImports = true,

View File

@ -16,7 +16,7 @@ return {
vim.env.VIMRUNTIME,
},
},
telemetry = {enable = false},
telemetry = { enable = false },
},
},
}

View File

@ -1,5 +1,5 @@
return {
cmd = { 'ruff', 'server' },
filetypes = { 'python' },
root_markers = { "pyproject.toml" },
root_markers = { 'pyproject.toml' },
}

View File

@ -1,5 +1,5 @@
return {
cmd = { 'rust-analyzer' },
filetypes = { 'rust' },
root_markers = { "Cargo.toml" },
root_markers = { 'Cargo.toml' },
}

View File

@ -1,5 +1,5 @@
-- [[ Autocommands ]]
-- See `:help lua-guide-autocommands`
require 'autocmds/lsp'
require 'autocmds/yank_hl'
require('autocmds/lsp')
require('autocmds/yank_hl')

View File

@ -21,12 +21,7 @@ vim.api.nvim_create_autocmd('LspAttach', {
-- LSP: Code Completion
if lsp_client:supports_method('textDocument/completion') then
vim.lsp.completion.enable(
true,
lsp_client.id,
buf,
{ autotrigger = false }
)
vim.lsp.completion.enable(true, lsp_client.id, buf, { autotrigger = false })
end
-- LSP: Diagnostics
@ -35,32 +30,24 @@ vim.api.nvim_create_autocmd('LspAttach', {
'n',
'<leader>le',
require('fzf-lua').diagnostics_document,
{ buffer = buf, desc = '[L]SP [E]rrors' })
{ buffer = buf, desc = '[L]SP [E]rrors' }
)
end
-- LSP: Diagnostics
if lsp_client:supports_method('textDocument/signatureHelp') then
vim.keymap.set(
'i',
'<c-s>',
vim.lsp.buf.signature_help,
{ buffer = buf, desc = 'LSP Signature Help' })
vim.keymap.set('i', '<c-s>', vim.lsp.buf.signature_help, { buffer = buf, desc = 'LSP Signature Help' })
end
-- LSP Action: Formatting
if lsp_client:supports_method('textDocument/formatting') or startswith(lsp_client.name, 'otter-ls') then
vim.keymap.set(
'n',
'<leader>lf',
function()
vim.keymap.set('n', '<leader>lf', function()
require('conform').format({
async = true,
bufnr = buf,
id = lsp_client.id,
})
end,
{ buffer = buf, desc = '[L]SP [F]ormat' }
)
end, { buffer = buf, desc = '[L]SP [F]ormat' })
-- Format the current buffer on save
--- TODO: Only on filetypes w/fast formatters?
@ -82,18 +69,13 @@ vim.api.nvim_create_autocmd('LspAttach', {
if lsp_client:supports_method('textDocument/inlayHint') and not startswith(lsp_client.name, 'otter-ls') then
vim.lsp.inlay_hint.enable(true, { bufnr = buf })
vim.keymap.set(
'n',
'<leader>lh',
function()
vim.keymap.set('n', '<leader>lh', function()
if vim.lsp.inlay_hint.is_enabled({ bufnr = buf }) then
vim.lsp.inlay_hint.enable(false, { bufnr = buf })
else
vim.lsp.inlay_hint.enable(true, { bufnr = buf })
end
end,
{ desc = '[L]SP Toggle Inlay [H]ints' }
)
end, { desc = '[L]SP Toggle Inlay [H]ints' })
end
-- LSP Action: Code Actions
@ -108,42 +90,31 @@ vim.api.nvim_create_autocmd('LspAttach', {
-- LSP Action: Rename
if lsp_client:supports_method('textDocument/rename') then
vim.keymap.set(
'n',
'<leader>lr',
vim.lsp.buf.rename,
{ buffer = buf, desc = '[L]SP [R]ename' }
)
vim.keymap.set('n', '<leader>lr', vim.lsp.buf.rename, { buffer = buf, desc = '[L]SP [R]ename' })
end
-- LSP Action: "Hover"
if lsp_client:supports_method('textDocument/hover') then
vim.keymap.set(
'n',
'K',
vim.lsp.buf.hover,
{ buffer = buf, desc = '[L]SP Hover' }
)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = buf, desc = '[L]SP Hover' })
end
-- LSP Action: References
if (
if
lsp_client:supports_method('textDocument/references')
or lsp_client:supports_method('textDocument/typeDefinition')
or lsp_client:supports_method('textDocument/definition')
) then
vim.keymap.set(
'n',
'<leader>ld',
require('fzf-lua').lsp_finder,
{ buffer = buf, desc = '[L]SP Fin[D]er' }
)
then
vim.keymap.set('n', '<leader>ld', require('fzf-lua').lsp_finder, { buffer = buf, desc = '[L]SP Fin[D]er' })
end
-- LSP Action: List Buffer Symbols
if lsp_client:supports_method('textDocument/documentSymbol') then
vim.keymap.set('n', '<leader>ls', require('fzf-lua').lsp_document_symbols,
{ buffer = buf, desc = '[L]SP [S]ymbols' })
end
vim.keymap.set(
'n',
'<leader>ls',
require('fzf-lua').lsp_document_symbols,
{ buffer = buf, desc = '[L]SP [S]ymbols' }
)
end
end,
})

View File

@ -2,5 +2,5 @@
-- Neovide
if vim.g.neovide then
require 'guis/neovide'
require('guis/neovide')
end

View File

@ -1,5 +1,5 @@
-- [[ Basic Keymaps ]]
--- See `:help vim.keymap.set()`
require 'keymaps/search_hl'
require 'keymaps/split_nav'
require 'keymaps/float_diag'
require('keymaps/search_hl')
require('keymaps/split_nav')
require('keymaps/float_diag')

View File

@ -1,61 +1,35 @@
vim.keymap.set(
'n',
'<leader>ds',
function()
vim.keymap.set('n', '<leader>ds', function()
vim.diagnostic.open_float()
end,
{ desc = '[D]ebug Float', silent = true }
)
end, { desc = '[D]ebug Float', silent = true })
vim.keymap.set(
'n',
'[d',
function()
vim.keymap.set('n', '[d', function()
vim.diagnostic.jump({
count = -1,
float = not vim.diagnostic.config().virtual_lines,
wrap = false,
})
end,
{ desc = 'Prev [D]iagnoatic', silent = true }
)
vim.keymap.set(
'n',
']d',
function()
end, { desc = 'Prev [D]iagnoatic', silent = true })
vim.keymap.set('n', ']d', function()
vim.diagnostic.jump({
count = 1,
float = not vim.diagnostic.config().virtual_lines,
wrap = false,
})
end,
{ desc = 'Next [D]iagnostic', silent = true }
)
end, { desc = 'Next [D]iagnostic', silent = true })
vim.keymap.set(
'n',
'[e',
function()
vim.keymap.set('n', '[e', function()
vim.diagnostic.jump({
count = -1,
float = not vim.diagnostic.config().virtual_lines,
wrap = false,
severity = vim.diagnostic.severity.ERROR,
})
end,
{ desc = 'Prev [E]rror', silent = true }
)
vim.keymap.set(
'n',
']e',
function()
end, { desc = 'Prev [E]rror', silent = true })
vim.keymap.set('n', ']e', function()
vim.diagnostic.jump({
count = 1,
float = not vim.diagnostic.config().virtual_lines,
wrap = false,
severity = vim.diagnostic.severity.ERROR,
})
end,
{ desc = 'Next [E]rror', silent = true }
)
end, { desc = 'Next [E]rror', silent = true })

View File

@ -91,11 +91,11 @@ require('lazy').setup({
require('plugins/langs/md_quarto/otter'),
require('plugins/langs/md_quarto/quarto-nvim'),
require('plugins/langs/md_quarto/img-clip'),
--require('plugins/langs/md_quarto/mdmath'),
require('plugins/langs/md_quarto/mdmath'),
require('plugins/langs/md_quarto/nabla'),
--require('plugins/langs/md_quarto/mkdnflow')
--require('plugins/langs/md_quarto/easytables'),
--require('plugins/langs/md_quarto/render-markdown-nvim'),
require('plugins/langs/md_quarto/render-markdown-nvim'),
-- Lang: Python
--require('plugins/langs/python/f-string-toggle'),

View File

@ -1,10 +1,10 @@
-- Catppuccin Theme
--- A soothing pastel theme for neovim.
return {
"catppuccin/nvim",
'catppuccin/nvim',
tag = 'v1.6.0',
name = "catppuccin",
name = 'catppuccin',
lazy = false,
priority = 1000,
@ -12,5 +12,5 @@ return {
config = function()
vim.cmd('colorscheme catppuccin')
end
end,
}

View File

@ -46,7 +46,9 @@ return {
return 1 -- Something non-nil prevents cmp.show()
end
end,
function(cmp) cmp.show({ providers = { 'snippets' } }) end,
function(cmp)
cmp.show({ providers = { 'snippets' } })
end,
},
['<C-j>'] = {
'select_next',

View File

@ -1,5 +1,5 @@
return {
"rafamadriz/friendly-snippets",
commit = "efff286dd74c22f731cdec26a70b46e5b203c619",
'rafamadriz/friendly-snippets',
commit = 'efff286dd74c22f731cdec26a70b46e5b203c619',
lazy = false,
}

View File

@ -1,6 +1,6 @@
return {
"mfussenegger/nvim-dap",
commit = "b4f27d451c187de912fa8d3229025a952917eb9e",
'mfussenegger/nvim-dap',
commit = 'b4f27d451c187de912fa8d3229025a952917eb9e',
lazy = true,
--dependencies = {
@ -9,22 +9,124 @@ return {
--},
keys = {
{ "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
{ "<leader>db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" },
{ "<leader>dc", function() require("dap").continue() end, desc = "Run/Continue" },
{ "<leader>da", function() require("dap").continue({ before = get_args }) end, desc = "Run with Args" },
{ "<leader>dC", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" },
{ "<leader>dg", function() require("dap").goto_() end, desc = "Go to Line (No Execute)" },
{ "<leader>di", function() require("dap").step_into() end, desc = "Step Into" },
{ "<leader>dj", function() require("dap").down() end, desc = "Down" },
{ "<leader>dk", function() require("dap").up() end, desc = "Up" },
{ "<leader>dl", function() require("dap").run_last() end, desc = "Run Last" },
{ "<leader>do", function() require("dap").step_out() end, desc = "Step Out" },
{ "<leader>dO", function() require("dap").step_over() end, desc = "Step Over" },
{ "<leader>dP", function() require("dap").pause() end, desc = "Pause" },
{ "<leader>dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" },
{ "<leader>ds", function() require("dap").session() end, desc = "Session" },
{ "<leader>dt", function() require("dap").terminate() end, desc = "Terminate" },
{ "<leader>dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" },
{
'<leader>dB',
function()
require('dap').set_breakpoint(vim.fn.input('Breakpoint condition: '))
end,
desc = 'Breakpoint Condition',
},
{
'<leader>db',
function()
require('dap').toggle_breakpoint()
end,
desc = 'Toggle Breakpoint',
},
{
'<leader>dc',
function()
require('dap').continue()
end,
desc = 'Run/Continue',
},
{
'<leader>da',
function()
require('dap').continue({ before = get_args })
end,
desc = 'Run with Args',
},
{
'<leader>dC',
function()
require('dap').run_to_cursor()
end,
desc = 'Run to Cursor',
},
{
'<leader>dg',
function()
require('dap').goto_()
end,
desc = 'Go to Line (No Execute)',
},
{
'<leader>di',
function()
require('dap').step_into()
end,
desc = 'Step Into',
},
{
'<leader>dj',
function()
require('dap').down()
end,
desc = 'Down',
},
{
'<leader>dk',
function()
require('dap').up()
end,
desc = 'Up',
},
{
'<leader>dl',
function()
require('dap').run_last()
end,
desc = 'Run Last',
},
{
'<leader>do',
function()
require('dap').step_out()
end,
desc = 'Step Out',
},
{
'<leader>dO',
function()
require('dap').step_over()
end,
desc = 'Step Over',
},
{
'<leader>dP',
function()
require('dap').pause()
end,
desc = 'Pause',
},
{
'<leader>dr',
function()
require('dap').repl.toggle()
end,
desc = 'Toggle REPL',
},
{
'<leader>ds',
function()
require('dap').session()
end,
desc = 'Session',
},
{
'<leader>dt',
function()
require('dap').terminate()
end,
desc = 'Terminate',
},
{
'<leader>dw',
function()
require('dap.ui.widgets').hover()
end,
desc = 'Widgets',
},
},
}

View File

@ -9,32 +9,32 @@ return {
lazy = true,
keys = {
{
"<leader>fml",
'<leader>fml',
function()
require('cellular-automaton').start_animation('make_it_rain')
end,
"n",
'n',
},
{
"<leader>fuck",
'<leader>fuck',
function()
require('cellular-automaton').start_animation('scramble')
end,
"n",
'n',
},
{
"<leader>fuck",
'<leader>fuck',
function()
require('cellular-automaton').start_animation('game_of_life')
end,
"n",
'n',
},
{
"<leader>FUCK",
'<leader>FUCK',
function()
require('cellular-automaton').start_animation('game_of_life')
end,
"n",
'n',
},
},
}

View File

@ -1,5 +1,5 @@
return {
"HakonHarnes/img-clip.nvim",
'HakonHarnes/img-clip.nvim',
commit = '5ded6f468d633ccfb315905fe8901d6c95ae8f29',
event = 'VeryLazy',

View File

@ -1,7 +1,7 @@
return {
'benlubas/molten-nvim',
commit = "a286aa914d9a154bc359131aab788b5a077a5a99",
build = ":UpdateRemotePlugins",
commit = 'a286aa914d9a154bc359131aab788b5a077a5a99',
build = ':UpdateRemotePlugins',
lazy = false,
--cmd = {
@ -35,36 +35,35 @@ return {
'<leader>ji',
function()
vim.ui.input({
prompt = 'Enter Jupyter Server URL:'
prompt = 'Enter Jupyter Server URL:',
}, function(input)
if input then
vim.cmd(':MoltenInit ' .. input)
end
end)
end,
desc = "[J]upyter [I]nitialize",
desc = '[J]upyter [I]nitialize',
},
{
'<leader>jo',
':noautocmd MoltenEnterOutput<CR>',
silent = true,
desc = "[J]upyter [I]nitialize"
desc = '[J]upyter [I]nitialize',
},
{
'<leader>jO',
':MoltenOpenInBrowser<CR>',
silent = true,
desc = "[J]upyter [I]nitialize"
desc = '[J]upyter [I]nitialize',
},
},
init = function()
-- Configuration
if vim.g.neovide then
vim.g.molten_image_provider = "image.nvim"
vim.g.molten_image_provider = 'image.nvim'
else
vim.g.molten_image_provider = "none"
vim.g.molten_image_provider = 'none'
end
vim.g.molten_output_win_max_height = 12
--vim.g.molten_auto_open_output = false

View File

@ -12,5 +12,5 @@ return {
mode = { 'i' },
desc = 'Toggle [U]I [E]quations',
},
}
},
}

View File

@ -1,6 +1,6 @@
return {
'jmbuhr/otter.nvim',
commit = "0e42fa795c35c7190935e3beda3791189c41bb72",
commit = '0e42fa795c35c7190935e3beda3791189c41bb72',
lazy = true,
opts = {

View File

@ -1,7 +1,7 @@
return {
--"quarto-dev/quarto-nvim",
dir = vim.env.HOME .. '/comps/neovim/quarto-nvim',
commit = "bfc191b2c9f973fd405e703bd0dfe11fb327a149",
commit = 'bfc191b2c9f973fd405e703bd0dfe11fb327a149',
lazy = true,
cmd = {
@ -23,42 +23,30 @@ return {
{
']c',
function()
require('nvim-treesitter.textobjects.move').goto_next_start(
'@cell.inner',
'textobjects'
)
require('nvim-treesitter.textobjects.move').goto_next_start('@cell.inner', 'textobjects')
end,
desc = "Goto Next [C]ell Start"
desc = 'Goto Next [C]ell Start',
},
{
'[c',
function()
require('nvim-treesitter.textobjects.move').goto_previous_start(
'@cell.inner',
'textobjects'
)
require('nvim-treesitter.textobjects.move').goto_previous_start('@cell.inner', 'textobjects')
end,
desc = "Goto Prev [C]ell Start"
desc = 'Goto Prev [C]ell Start',
},
{
']C',
function()
require('nvim-treesitter.textobjects.move').goto_next_end(
'@cell.outer',
'textobjects'
)
require('nvim-treesitter.textobjects.move').goto_next_end('@cell.outer', 'textobjects')
end,
desc = "Goto Next [C]ell End"
desc = 'Goto Next [C]ell End',
},
{
'[C',
function()
require('nvim-treesitter.textobjects.move').goto_previous_end(
'@cell.outer',
'textobjects'
)
require('nvim-treesitter.textobjects.move').goto_previous_end('@cell.outer', 'textobjects')
end,
desc = "Goto Prev [C]ell End"
desc = 'Goto Prev [C]ell End',
},
-- Jupyter / Notebooks
--- <leader>j
@ -68,7 +56,7 @@ return {
require('quarto.runner').run_cell()
--vim.cmd(':noautocmd MoltenEnterOutput')
end,
desc = "[J]upyter Run Ce[L]l",
desc = '[J]upyter Run Ce[L]l',
silent = true,
},
{
@ -77,55 +65,61 @@ return {
require('quarto.runner').run_cell()
vim.cmd(':MoltenOpenInBrowser')
end,
desc = "[J]upyter Run Ce[L]l"
desc = '[J]upyter Run Ce[L]l',
},
{
'<leader>j;',
function()
require('quarto.runner').run_cell()
require('nvim-treesitter.textobjects.move').goto_next_start(
'@cell.inner',
'textobjects'
)
require('nvim-treesitter.textobjects.move').goto_next_start('@cell.inner', 'textobjects')
end,
desc = "[J]upyter Run Cell and Skip"
desc = '[J]upyter Run Cell and Skip',
},
{
'<leader>jk',
function() require('quarto.runner').run_above() end,
desc = "[J]upyter Run Cell Above"
function()
require('quarto.runner').run_above()
end,
desc = '[J]upyter Run Cell Above',
},
{
'<leader>jA',
function() require('quarto.runner').run_all() end,
desc = "[J]upyter Run Cell Below"
function()
require('quarto.runner').run_all()
end,
desc = '[J]upyter Run Cell Below',
},
{
'<leader>j,',
function() require('quarto.runner').run_line() end,
desc = "[J]upyter Run L[I]ne"
function()
require('quarto.runner').run_line()
end,
desc = '[J]upyter Run L[I]ne',
},
{
'<leader>jp',
function() require('quarto').quartoPreview() end,
desc = "[J]upyter Start [P]review"
function()
require('quarto').quartoPreview()
end,
desc = '[J]upyter Start [P]review',
},
{
'<leader>jP',
function() require('quarto').quartoStopPreview() end,
desc = "[J]upyter Stop [P]review"
function()
require('quarto').quartoStopPreview()
end,
desc = '[J]upyter Stop [P]review',
},
},
init = function()
vim.treesitter.language.register("markdown", { "quarto", "rmd" })
vim.treesitter.language.register('markdown', { 'quarto', 'rmd' })
vim.api.nvim_create_autocmd('FileType', {
pattern = { 'quarto' },
callback = function(ev)
require('quarto').activate()
end
end,
})
end,

View File

@ -2,16 +2,13 @@ return {
'MeanderingProgrammer/render-markdown.nvim',
commit = '17a77463f945c4b9e4f371c752efd90e3e1bf604',
enabled = false,
ft = { 'markdown', 'quarto' },
opts = {
file_types = { 'markdown', 'quarto' },
latex = { enabled = false },
win_options = { conceallevel = { rendered = 2 } },
heading = {
},
heading = {},
code = {
position = 'right',
width = 'block',

View File

@ -1,6 +1,6 @@
return {
"3rd/image.nvim",
commit = "7704e1d03d952393774dc7d00a98d8e127086ba4",
'3rd/image.nvim',
commit = '7704e1d03d952393774dc7d00a98d8e127086ba4',
lazy = false,
enabled = not vim.g.neovide,
@ -10,13 +10,13 @@ return {
},
opts = {
backend = "kitty",
processor = "magick_rock",
backend = 'kitty',
processor = 'magick_rock',
integrations = {
markdown = {
only_render_image_at_cursor = true,
--floating_windows = true,
filetypes = { "markdown", "quarto" },
filetypes = { 'markdown', 'quarto' },
},
},
max_width = 100,
@ -24,6 +24,6 @@ return {
max_height_window_percentage = math.huge,
max_width_window_percentage = math.huge,
window_overlap_clear_enabled = true,
window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "" },
}
window_overlap_clear_ft_ignore = { 'cmp_menu', 'cmp_docs', '' },
},
}

View File

@ -1,5 +1,5 @@
return {
'MunifTanjim/nui.nvim',
commit = "53e907ffe5eedebdca1cd503b00aa8692068ca46",
commit = '53e907ffe5eedebdca1cd503b00aa8692068ca46',
lazy = true,
}

View File

@ -1,5 +1,5 @@
return {
"nvim-neotest/nvim-nio",
commit = "21f5324bfac14e22ba26553caf69ec76ae8a7662",
'nvim-neotest/nvim-nio',
commit = '21f5324bfac14e22ba26553caf69ec76ae8a7662',
lazy = true,
}

View File

@ -1,13 +1,13 @@
local function close_floats()
for _, win in ipairs(vim.api.nvim_list_wins()) do
if vim.api.nvim_win_get_config(win).relative == "win" then
if vim.api.nvim_win_get_config(win).relative == 'win' then
vim.api.nvim_win_close(win, false)
end
end
end
return {
"https://git.sr.ht/~whynothugo/lsp_lines.nvim",
'https://git.sr.ht/~whynothugo/lsp_lines.nvim',
commit = 'a92c755f182b89ea91bd8a6a2227208026f27b4d',
lazy = false,
@ -15,7 +15,7 @@ return {
{
'<leader>df',
function()
require("lsp_lines").toggle()
require('lsp_lines').toggle()
if vim.diagnostic.config().virtual_lines then
close_floats()
@ -40,5 +40,5 @@ return {
--vim.diagnostic.config({ virtual_text = false, virtual_lines = { only_current_line = true }, })
end,
opts = {}
opts = {},
}

View File

@ -1,9 +1,9 @@
-- tiny-code-action
--- Simple code-action visualization with telescope
return {
"rachartier/tiny-code-action.nvim",
'rachartier/tiny-code-action.nvim',
lazy = true,
opts = {
backend = "vim",
backend = 'vim',
},
}

View File

@ -13,38 +13,48 @@ return {
lazy = true,
cmd = {
"Telescope",
'Telescope',
},
keys = {
-- Accessibility
{
'<leader>s?',
function() require('fzf-lua').builtin() end,
function()
require('fzf-lua').builtin()
end,
'n',
desc = '[S]earch Search-Commands',
},
{
'<leader>sh',
function() require('fzf-lua').helptags() end,
function()
require('fzf-lua').helptags()
end,
'n',
desc = '[S]earch [H]elp Tags',
},
{
'<leader>sk',
function() require('fzf-lua').keymaps() end,
function()
require('fzf-lua').keymaps()
end,
'n',
desc = '[S]earch [K]eymaps',
},
{
'<leader>sc',
function() require('fzf-lua').commands() end,
function()
require('fzf-lua').commands()
end,
'n',
desc = '[S]earch [C]ommands',
},
{
'<leader>sm',
function() require('fzf-lua').manpages() end,
function()
require('fzf-lua').manpages()
end,
'n',
desc = '[S]earch [M]anpages',
},
@ -52,7 +62,9 @@ return {
-- Grep
{
'<leader>sg',
function() require('fzf-lua').live_grep() end,
function()
require('fzf-lua').live_grep()
end,
'n',
desc = '[S]earch w/[G]rep',
},
@ -60,13 +72,17 @@ return {
-- Buffer / File Search
{
'<leader>sb',
function() require('fzf-lua').buffers() end,
function()
require('fzf-lua').buffers()
end,
'n',
desc = '[S]earch [B]uffers',
},
{
'<leader>sf',
function() require('fzf-lua').files() end,
function()
require('fzf-lua').files()
end,
'n',
desc = '[S]earch [F]iles',
},
@ -74,21 +90,27 @@ return {
-- Git: "VCS" -> "v"
{
'<leader>sgc',
function() require('fzf-lua').git_commits() end,
function()
require('fzf-lua').git_commits()
end,
'n',
desc = '[S]earch Git [C]ommits',
},
{
'<leader>sgs',
function() require('fzf-lua').git_status() end,
function()
require('fzf-lua').git_status()
end,
'n',
desc = '[S]earch Git [S]tatus',
},
-- Debug
{
"<leader>sd",
function() require('fzf-lua').diagnostics_document() end,
'<leader>sd',
function()
require('fzf-lua').diagnostics_document()
end,
'n',
desc = '[S]earch [D]iagnostics',
},
@ -96,7 +118,9 @@ return {
-- Vim
{
"<leader>s'",
function() require('fzf-lua').registers() end,
function()
require('fzf-lua').registers()
end,
'n',
desc = '[S]earch Vim Registers',
},
@ -106,25 +130,25 @@ return {
fzf_bin = 'sk',
keymap = {
builtin = {
["<c-b>"] = "preview-page-up",
["<c-f>"] = "preview-page-down",
['<c-b>'] = 'preview-page-up',
['<c-f>'] = 'preview-page-down',
},
fzf = {
["ctrl-u"] = "half-page-up",
["ctrl-d"] = "half-page-down",
["ctrl-b"] = "preview-page-up",
["ctrl-f"] = "preview-page-down",
['ctrl-u'] = 'half-page-up',
['ctrl-d'] = 'half-page-down',
['ctrl-b'] = 'preview-page-up',
['ctrl-f'] = 'preview-page-down',
},
},
previewers = {
builtin = {
extensions = {
["png"] = { "chafa", "{file}" },
["jpg"] = { "chafa", "{file}" },
["jpeg"] = { "chafa", "{file}" },
["gif"] = { "chafa", "{file}" },
["svg"] = { "chafa", "{file}" },
["webp"] = { "chafa", "{file}" },
['png'] = { 'chafa', '{file}' },
['jpg'] = { 'chafa', '{file}' },
['jpeg'] = { 'chafa', '{file}' },
['gif'] = { 'chafa', '{file}' },
['svg'] = { 'chafa', '{file}' },
['webp'] = { 'chafa', '{file}' },
},
},
},
@ -134,12 +158,12 @@ return {
row = 0.5,
col = 0.5,
preview = {
scrollchars = { "", "" },
scrollchars = { '', '' },
},
},
fzf_colors = true,
fzf_opts = {
["--no-scrollbar"] = true,
['--no-scrollbar'] = true,
},
},
}

View File

@ -1,32 +1,40 @@
return {
"folke/snacks.nvim",
commit = "b773368f8aa6e84a68e979f0e335d23de71f405a",
'folke/snacks.nvim',
commit = 'b773368f8aa6e84a68e979f0e335d23de71f405a',
lazy = false,
priority = 1000,
keys = {
{
"<c-w>d",
function() require('snacks').bufdelete() end,
desc = "Delete Current Buffer",
'<c-w>d',
function()
require('snacks').bufdelete()
end,
desc = 'Delete Current Buffer',
},
-- UX
--- <leader>u
{
"<leader>ud",
function() require('snacks').dim() end,
desc = "[U]I [D]imming",
'<leader>ud',
function()
require('snacks').dim()
end,
desc = '[U]I [D]imming',
},
{
"<leader>us",
function() require('snacks').dim.disable() end,
desc = "Disable [U]I Dimming",
'<leader>us',
function()
require('snacks').dim.disable()
end,
desc = 'Disable [U]I Dimming',
},
{
"<leader>uz",
function() require('snacks').zen() end,
desc = "[U]I [Z]en Mode",
'<leader>uz',
function()
require('snacks').zen()
end,
desc = '[U]I [Z]en Mode',
},
},
@ -44,7 +52,7 @@ return {
indent = {
animate = {
enabled = false,
}
},
},
-- Input: Better vim.ui.input

View File

@ -1,5 +1,5 @@
return {
"nvim-neotest/neotest-python",
commit = "a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e",
'nvim-neotest/neotest-python',
commit = 'a2861ab3c9a0bf75a56b11835c2bfc8270f5be7e',
lazy = true,
}

View File

@ -1,29 +1,83 @@
return {
"nvim-neotest/neotest",
commit = "d66cf4e05a116957f0d3a7755a24291c7d1e1f72",
'nvim-neotest/neotest',
commit = 'd66cf4e05a116957f0d3a7755a24291c7d1e1f72',
lazy = true,
opts = function(_, _)
return {
adapters = {
require("neotest-python")
require('neotest-python'),
},
}
end,
keys = {
{
"<leader>t",
"",
desc = "+test"
'<leader>t',
'',
desc = '+test',
},
{
'<leader>tt',
function()
require('neotest').run.run(vim.fn.expand('%'))
end,
desc = 'Run File (Neotest)',
},
{
'<leader>tT',
function()
require('neotest').run.run(vim.uv.cwd())
end,
desc = 'Run All Test Files (Neotest)',
},
{
'<leader>tr',
function()
require('neotest').run.run()
end,
desc = 'Run Nearest (Neotest)',
},
{
'<leader>tl',
function()
require('neotest').run.run_last()
end,
desc = 'Run Last (Neotest)',
},
{
'<leader>ts',
function()
require('neotest').summary.toggle()
end,
desc = 'Toggle Summary (Neotest)',
},
{
'<leader>to',
function()
require('neotest').output.open({ enter = true, auto_close = true })
end,
desc = 'Show Output (Neotest)',
},
{
'<leader>tO',
function()
require('neotest').output_panel.toggle()
end,
desc = 'Toggle Output Panel (Neotest)',
},
{
'<leader>tS',
function()
require('neotest').run.stop()
end,
desc = 'Stop (Neotest)',
},
{
'<leader>tw',
function()
require('neotest').watch.toggle(vim.fn.expand('%'))
end,
desc = 'Toggle Watch (Neotest)',
},
{ "<leader>tt", function() require("neotest").run.run(vim.fn.expand("%")) end, desc = "Run File (Neotest)" },
{ "<leader>tT", function() require("neotest").run.run(vim.uv.cwd()) end, desc = "Run All Test Files (Neotest)" },
{ "<leader>tr", function() require("neotest").run.run() end, desc = "Run Nearest (Neotest)" },
{ "<leader>tl", function() require("neotest").run.run_last() end, desc = "Run Last (Neotest)" },
{ "<leader>ts", function() require("neotest").summary.toggle() end, desc = "Toggle Summary (Neotest)" },
{ "<leader>to", function() require("neotest").output.open({ enter = true, auto_close = true }) end, desc = "Show Output (Neotest)" },
{ "<leader>tO", function() require("neotest").output_panel.toggle() end, desc = "Toggle Output Panel (Neotest)" },
{ "<leader>tS", function() require("neotest").run.stop() end, desc = "Stop (Neotest)" },
{ "<leader>tw", function() require("neotest").watch.toggle(vim.fn.expand("%")) end, desc = "Toggle Watch (Neotest)" },
},
}

View File

@ -3,8 +3,8 @@
--- Seriously awesome. Ex. pipe anything into | nvim to open in a new buffer.
--- See https://github.com/willothy/flatten.nvim
return {
"willothy/flatten.nvim",
commit = "b17a3e65c2e4e2ecd1345a2d08435e80f982c4a6",
'willothy/flatten.nvim',
commit = 'b17a3e65c2e4e2ecd1345a2d08435e80f982c4a6',
lazy = false,
priority = 1001,

View File

@ -1,6 +1,6 @@
return {
"folke/noice.nvim",
event = "VeryLazy",
'folke/noice.nvim',
event = 'VeryLazy',
opts = {
cmdline = { enabled = false },
messages = { enabled = false },
@ -10,8 +10,8 @@ return {
lsp = {
progress = { enabled = false },
override = {
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
["vim.lsp.util.stylize_markdown"] = true,
['vim.lsp.util.convert_input_to_markdown_lines'] = true,
['vim.lsp.util.stylize_markdown'] = true,
},
hover = { enabled = true },
signature = { enabled = true },

View File

@ -2,7 +2,7 @@
--- Whenever a key is pressed, display possible key bindings of what is being typed.
--- Automatically reads the desc attribute of custom key bindings.
return {
"folke/which-key.nvim",
'folke/which-key.nvim',
commit = '0e76a87ac51772569aec678dc74baa8e2a86100c',
event = 'VeryLazy',
}

View File

@ -13,99 +13,57 @@ return {
on_attach = function(buf)
-- Hunk Navigation
vim.keymap.set(
'n',
']g',
function()
vim.keymap.set('n', ']g', function()
if vim.wo.diff then
vim.cmd.normal({ ']c', bang = true })
else
require('gitsigns').nav_hunk('next')
end
end,
{ buffer = buf, desc = 'Next [G]it Change' }
)
vim.keymap.set(
'n',
'[g',
function()
end, { buffer = buf, desc = 'Next [G]it Change' })
vim.keymap.set('n', '[g', function()
if vim.wo.diff then
vim.cmd.normal({ '[c', bang = true })
else
require('gitsigns').nav_hunk('prev')
end
end,
{ buffer = buf, desc = 'Prev [G]it Change' }
)
end, { buffer = buf, desc = 'Prev [G]it Change' })
-- Hunk Preview
vim.keymap.set(
'n',
'<leader>gp',
function() require('gitsigns').preview_hunk() end,
{ buffer = buf, desc = '[G]it [P]review Hunk' }
)
vim.keymap.set('n', '<leader>gp', function()
require('gitsigns').preview_hunk()
end, { buffer = buf, desc = '[G]it [P]review Hunk' })
-- Buffer Staging / Unstaging
vim.keymap.set(
'n',
'<leader>gs',
function() require('gitsigns').stage_buffer() end,
{ buffer = buf, desc = '[G]it [S]tage Buffer' }
)
vim.keymap.set(
'n',
'<leader>gS',
function() require('gitsigns').reset_buffer_index() end,
{ buffer = buf, desc = '[G]it Unstage Buffer' }
)
vim.keymap.set('n', '<leader>gs', function()
require('gitsigns').stage_buffer()
end, { buffer = buf, desc = '[G]it [S]tage Buffer' })
vim.keymap.set('n', '<leader>gS', function()
require('gitsigns').reset_buffer_index()
end, { buffer = buf, desc = '[G]it Unstage Buffer' })
-- Hunk Staging
vim.keymap.set(
'n',
'<leader>gh',
function() require('gitsigns').stage_hunk() end,
{ buffer = buf, desc = '[G]it Hunk [S]tage Toggle' }
)
vim.keymap.set('n', '<leader>gh', function()
require('gitsigns').stage_hunk()
end, { buffer = buf, desc = '[G]it Hunk [S]tage Toggle' })
-- Restoration
vim.keymap.set(
'n',
'<leader>gr',
function()
vim.keymap.set('n', '<leader>gr', function()
require('gitsigns').reset_hunk()
end,
{ buffer = buf, desc = '[G]it [R]estore Hunk' }
)
vim.keymap.set(
'n',
'<leader>gR',
function()
local choice = vim.fn.confirm(
"Delete all unstaged changes in this buffer?",
"&Yes\n&No",
2
)
end, { buffer = buf, desc = '[G]it [R]estore Hunk' })
vim.keymap.set('n', '<leader>gR', function()
local choice = vim.fn.confirm('Delete all unstaged changes in this buffer?', '&Yes\n&No', 2)
if choice == 1 then
require('gitsigns').reset_buffer()
end
end,
{ buffer = buf, desc = '[G]it [R]estore Buffer' }
)
end, { buffer = buf, desc = '[G]it [R]estore Buffer' })
vim.keymap.set(
'n',
'<leader>ga',
function()
vim.keymap.set('n', '<leader>ga', function()
require('gitsigns').toggle_linehl()
require('gitsigns').toggle_word_diff()
end,
{ buffer = buf, desc = '[G]it [A]nalysis Toggle' }
)
end, { buffer = buf, desc = '[G]it [A]nalysis Toggle' })
-- TODO: Shortcut for opening lazygit in a new :term.
--- Perhaps even in a new tab?
end,
}
},
}

View File

@ -12,7 +12,7 @@ return {
end
end,
'n',
desc = '[F]ile Browser'
desc = '[F]ile Browser',
},
},

View File

@ -3,27 +3,27 @@
-- Utilities
return {
"coffebar/neovim-project",
'coffebar/neovim-project',
opts = {
projects = { -- define project roots
"~/src/*",
"~/.config/*",
'~/src/*',
'~/.config/*',
},
picker = {
type = "telescope", -- or "fzf-lua"
}
type = 'telescope', -- or "fzf-lua"
},
},
init = function()
-- enable saving the state of plugins in the session
vim.opt.sessionoptions:append("globals") -- save global variables that start with an uppercase letter and contain at least one lowercase letter.
vim.opt.sessionoptions:append('globals') -- save global variables that start with an uppercase letter and contain at least one lowercase letter.
end,
dependencies = {
{ "nvim-lua/plenary.nvim" },
{ 'nvim-lua/plenary.nvim' },
-- optional picker
{ "nvim-telescope/telescope.nvim", tag = "0.1.4" },
{ 'nvim-telescope/telescope.nvim', tag = '0.1.4' },
-- optional picker
{ "ibhagwan/fzf-lua" },
{ "Shatur/neovim-session-manager" },
{ 'ibhagwan/fzf-lua' },
{ 'Shatur/neovim-session-manager' },
},
lazy = false,
priority = 100,

View File

@ -27,11 +27,11 @@ return {
keys = {
{
"<leader>sp",
'<leader>sp',
function()
require('fzf-lua-p').projects()
end,
"n",
'n',
},
},
@ -59,10 +59,12 @@ return {
--####################
vim.api.nvim_create_autocmd({ 'VimEnter' }, {
callback = function()
local workspaces = require("projections.workspace").get_workspaces()
local workspaces = require('projections.workspace').get_workspaces()
local cwd = vim.loop.cwd()
if not cwd then return end
if not cwd then
return
end
-- If Currently Within a Project, CD to that Project
for _, ws in ipairs(workspaces) do
@ -73,7 +75,9 @@ return {
end
end
end
if not cwd then return end
if not cwd then
return
end
-- If Path was Opened: Retrieve That Path
local path_opened_file = nil
@ -95,7 +99,7 @@ return {
vim.cmd('e ' .. path_opened_file)
end
-- TODO: Perhaps we need to question the user a little more about what they want.
end
end,
})
end,
@ -109,16 +113,16 @@ return {
--- Blender
{ '~/src/blender', { '.git' } },
--- College
{ '~/src/college/bsc', { ".active_course" } },
{ '~/src/college/msc', { ".active_course" } },
{ '~/src/college/bsc', { '.active_course' } },
{ '~/src/college/msc', { '.active_course' } },
--- Infrastructures
{ '~/src/infras/clusters', { '.git' } },
--- Photonics
{ '~/src/photonics/books', { '.git' } },
{ '~/src/photonics/packages', { '.git' } },
--- Neovim
{ "~/comps/neovim", { '.git' } },
{ "~/.config", { 'nvim.version' } },
{ '~/comps/neovim', { '.git' } },
{ '~/.config', { 'nvim.version' } },
},
},
}