djweber12/my_nvim_config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding find all files to telescope and remap conflixt

Browse Source
This commit is contained in:
Daniel Weber 2024-12-20 10:50:13 -05:00
parent dcda42d32e
commit 48021b5b4e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
after/plugin/git_stuff.lua
View File

@ -40,7 +40,7 @@ require('gitsigns').setup{
map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'reset buffer' }) map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'reset buffer' })
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'preview hunk' }) map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'preview hunk' })
map('n', '<leader>hb', function() gitsigns.blame_line{full=true} end, { desc = 'hunk blame' }) map('n', '<leader>hb', function() gitsigns.blame_line{full=true} end, { desc = 'hunk blame' })
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = 'toggle single line blame' }) map('n', '<leader>tob', gitsigns.toggle_current_line_blame, { desc = '[t]oggle [o]ne line [b]lame' })
map('n', '<leader>hd', gitsigns.diffthis, { desc = 'hunk diff' }) map('n', '<leader>hd', gitsigns.diffthis, { desc = 'hunk diff' })
map('n', '<leader>hD', function() gitsigns.diffthis('~') end, { desc = 'diff deleted' }) map('n', '<leader>hD', function() gitsigns.diffthis('~') end, { desc = 'diff deleted' })
map('n', '<leader>td', gitsigns.toggle_deleted, { desc = 'toggle deleted' }) map('n', '<leader>td', gitsigns.toggle_deleted, { desc = 'toggle deleted' })

4
after/plugin/telescope.lua
View File

@ -12,6 +12,10 @@ require('telescope').setup{
local builtin = require('telescope.builtin') local builtin = require('telescope.builtin')
vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = "Find files" }) vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = "Find files" })
vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = "Find in live grep" }) vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = "Find in live grep" })
vim.keymap.set('n', '<leader>faf',
function()
require('telescope.builtin').find_files({ hidden = true, additional_args = { "-u" } })
end, { desc = "Find all files(including ignored files)" })
vim.keymap.set('n', '<leader>fag', vim.keymap.set('n', '<leader>fag',
function() function()
require('telescope.builtin').live_grep({ additional_args = { "-u" } }) require('telescope.builtin').live_grep({ additional_args = { "-u" } })