Skip to content

Commit ebec6f2

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
i did somehting wrong and now im here
2 parents 95e35d4 + de44f49 commit ebec6f2

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

init.lua

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,8 @@ require('lazy').setup({
182182
-- which loads which-key before all the UI elements are loaded. Events can be
183183
-- normal autocommands events (`:help autocmd-events`).
184184
--
185-
-- Then, because we use the `config` key, the configuration only runs
186-
-- after the plugin has been loaded:
187-
-- config = function() ... end
185+
-- Then, because we use the `opts` key (recommended), the configuration runs
186+
-- after the plugin has been loaded as `require(MODULE).setup(opts)`.
188187

189188
{ -- Useful plugin to show you pending keybinds.
190189
'folke/which-key.nvim',
@@ -544,8 +543,8 @@ require('lazy').setup({
544543
--
545544

546545
lua_ls = {
547-
-- cmd = {...},
548-
-- filetypes = { ...},
546+
-- cmd = { ... },
547+
-- filetypes = { ... },
549548
-- capabilities = {},
550549
settings = {
551550
Lua = {

lua/kickstart/plugins/gitsigns.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ return {
3636
-- visual mode
3737
map('v', '<leader>hs', function()
3838
gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
39-
end, { desc = 'stage git hunk' })
39+
end, { desc = 'git [s]tage hunk' })
4040
map('v', '<leader>hr', function()
4141
gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
42-
end, { desc = 'reset git hunk' })
42+
end, { desc = 'git [r]eset hunk' })
4343
-- normal mode
4444
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
4545
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })

0 commit comments

Comments
 (0)