Compare commits

..

4 Commits

Author SHA1 Message Date
Ori Perry
f0f68bdace
Merge e944ffc9542f92eab079581e0ea80d1033fa1890 into d350db2449da40df003c40d440f909d74e2d4e70 2025-04-18 16:42:42 +00:00
orip
e944ffc954 Update the github workflow
This is done in order to use a newer version of stylua
2025-04-18 19:41:55 +03:00
orip
d99a83db3c Switch telescope for snacks.nvim 2025-04-18 19:30:50 +03:00
orip
3d4208666d Collapse small functions when formatting
This would allow to write more concise and easy to understands keybinds in
the following commit
2025-04-18 19:21:35 +03:00
3 changed files with 31 additions and 13 deletions

View File

@ -348,8 +348,6 @@ require('lazy').setup({
{ -- Fuzzy Finder (files, lsp, etc)
'folke/snacks.nvim',
priority = 1000,
lazy = false,
dependencies = {
-- Useful for getting pretty icons, but requires a Nerd Font.
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
@ -808,7 +806,7 @@ require('lazy').setup({
-- Change the name of the colorscheme plugin below, and then
-- change the command in the config to whatever the name of that colorscheme is.
--
-- If you want to see what colorschemes are already installed, you can use `:lua Snacks.picker.colorschemes()`.
-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
'folke/tokyonight.nvim',
priority = 1000, -- Make sure to load this before all the other start plugins.
config = function()

View File

@ -28,38 +28,52 @@ return {
-- Basic debugging keymaps, feel free to change to your liking!
{
'<F5>',
function() require('dap').continue() end,
function()
require('dap').continue()
end,
desc = 'Debug: Start/Continue',
},
{
'<F1>',
function() require('dap').step_into() end,
function()
require('dap').step_into()
end,
desc = 'Debug: Step Into',
},
{
'<F2>',
function() require('dap').step_over() end,
function()
require('dap').step_over()
end,
desc = 'Debug: Step Over',
},
{
'<F3>',
function() require('dap').step_out() end,
function()
require('dap').step_out()
end,
desc = 'Debug: Step Out',
},
{
'<leader>b',
function() require('dap').toggle_breakpoint() end,
function()
require('dap').toggle_breakpoint()
end,
desc = 'Debug: Toggle Breakpoint',
},
{
'<leader>B',
function() require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ') end,
function()
require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ')
end,
desc = 'Debug: Set Breakpoint',
},
-- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
{
'<F7>',
function() require('dapui').toggle() end,
function()
require('dapui').toggle()
end,
desc = 'Debug: See last session result.',
},
},

View File

@ -34,8 +34,12 @@ return {
-- Actions
-- visual mode
map('v', '<leader>hs', function() gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [s]tage hunk' })
map('v', '<leader>hr', function() gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } end, { desc = 'git [r]eset hunk' })
map('v', '<leader>hs', function()
gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
end, { desc = 'git [s]tage hunk' })
map('v', '<leader>hr', function()
gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
end, { desc = 'git [r]eset hunk' })
-- normal mode
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
@ -45,7 +49,9 @@ return {
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
map('n', '<leader>hD', function() gitsigns.diffthis '@' end, { desc = 'git [D]iff against last commit' })
map('n', '<leader>hD', function()
gitsigns.diffthis '@'
end, { desc = 'git [D]iff against last commit' })
-- Toggles
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })