mathias
/
nvim-kickstart
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added diffview with keymap

main
Mathias Rothenhaeusler 2024-10-07 14:12:46 +02:00
parent 66ffd49dd6
commit a469b206fd
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lua/custom/keymaps.lua
View File

@ -48,6 +48,9 @@ keymap.set('n', '<leader>sk', '<cmd>Telescope keymaps<cr>', { silent = true })
keymap.set('n', '<leader>1', ':diffget LOCAL<CR>') keymap.set('n', '<leader>1', ':diffget LOCAL<CR>')
keymap.set('n', '<leader>2', ':diffget REMOTE<CR>') keymap.set('n', '<leader>2', ':diffget REMOTE<CR>')
-- git diff
keymap.set('n', '<leader>gh', ':DiffviewFileHistory %<CR>', { silent = true })
-- toggleterm -- toggleterm
keymap.set('n', '<M-1>', '<cmd>ToggleTerm direction=horizontal<cr>', { silent = true }) keymap.set('n', '<M-1>', '<cmd>ToggleTerm direction=horizontal<cr>', { silent = true })

2
lua/custom/plugins/init.lua
View File

@ -108,6 +108,8 @@ return {
'mistweaverco/kulala.nvim', 'mistweaverco/kulala.nvim',
}, },
"sindrets/diffview.nvim",
-- lazy.nvim Hardtime -- lazy.nvim Hardtime
-- { -- {
-- "m4xshen/hardtime.nvim", -- "m4xshen/hardtime.nvim",