Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasvianav committed Jan 11, 2025
1 parent b4c19f2 commit a3dd708
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 37 deletions.
32 changes: 16 additions & 16 deletions lua/v/plugins/general/easyclip.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,31 @@ require('v.utils').set_viml_options('EasyClip', {

require('v.utils.mappings').set_keybindings({
-- use s for substituting
{ 'n', 's', '<plug>SubstituteOverMotionMap' },
{ 'n', 'ss', '<plug>SubstituteLine' },
{ 'x', 's', '<plug>XEasyClipPaste' },
{ 'n', 'S', '<plug>SubstituteToEndOfLine' },
{ 'n', 's', '<plug>SubstituteOverMotionMap' },
{ 'n', 'ss', '<plug>SubstituteLine' },
{ 'x', 's', '<plug>XEasyClipPaste' },
{ 'n', 'S', '<plug>SubstituteToEndOfLine' },

-- use x for cutting
{ 'n', 'x', '<Plug>MoveMotionPlug' },
{ 'x', 'x', '<Plug>MoveMotionXPlug' },
{ 'n', 'xx', '<Plug>MoveMotionLinePlug' },
{ 'n', 'X', '<Plug>MoveMotionEndOfLinePlug' },
{ 'n', 'x', '<Plug>MoveMotionPlug' },
{ 'x', 'x', '<Plug>MoveMotionXPlug' },
{ 'n', 'xx', '<Plug>MoveMotionLinePlug' },
{ 'n', 'X', '<Plug>MoveMotionEndOfLinePlug' },

-- toggle paste autoformat
{ 'n', '<leader>cf', '<plug>EasyClipToggleFormattedPaste' },

-- paste in insert mode
{ 'i', '<m-v>', '<c-v>' },
{ 'i', '<c-v>', '<plug>EasyClipInsertModePaste' },
{ 'i', '<m-v>', '<c-v>' },
{ 'i', '<c-v>', '<plug>EasyClipInsertModePaste' },

-- navigate through the yank ring
{ 'n', ']p', '<Plug>EasyClipRotateYanksForward' },
{ 'n', '[p', '<Plug>EasyClipRotateYanksBackward' },
{ 'x', ']p', '<Plug>EasyClipRotateYanksForward' },
{ 'x', '[p', '<Plug>EasyClipRotateYanksBackward' },
{ 'n', '[p', '<Plug>EasyClipRotateYanksForward' },
{ 'n', ']p', '<Plug>EasyClipRotateYanksBackward' },
{ 'x', ']p', '<Plug>EasyClipRotateYanksForward' },
{ 'x', '[p', '<Plug>EasyClipRotateYanksBackward' },

-- restore mark mapping
{ 'n', 'm', 'm' },
{ 'n', 'mm', 'mm' },
{ 'n', 'm', 'm' },
{ 'n', 'mm', 'mm' },
})
46 changes: 25 additions & 21 deletions lua/v/plugins/navigation/telescope.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ telescope.setup({
},
},
},

pickers = {
find_files = {
follow = true,
Expand All @@ -71,11 +70,16 @@ telescope.setup({
'**/.git/*',
'^./.git',
'**/node_modules/*',
'package-lock.json',
'yarn.lock',
},
},

live_grep = {
glob_pattern = '!package-lock.json',
glob_pattern = {
'!package-lock.json',
'!yarn.lock',
},
},

git_commits = {
Expand Down Expand Up @@ -121,19 +125,19 @@ telescope.load_extension('fzf')

require('v.utils.mappings').set_keybindings({
-- general
{ 'n', '<Leader>ff', builtin.find_files },
{ 'n', '<Leader>fr', builtin.resume },
{ 'n', '<Leader>fp', builtin.live_grep },
{ 'n', '<Leader>fb', builtin.buffers },
{ 'n', '<Leader>fc', builtin.commands },
{ 'n', '<Leader>ff', builtin.find_files },
{ 'n', '<Leader>fr', builtin.resume },
{ 'n', '<Leader>fp', builtin.live_grep },
{ 'n', '<Leader>fb', builtin.buffers },
{ 'n', '<Leader>fc', builtin.commands },
{ 'n', '<Leader>fch', builtin.command_history },
{ 'n', '<Leader>fj', builtin.jumplist },
{ 'n', 'z=', builtin.spell_suggest },
{ 'n', '<Leader>fj', builtin.jumplist },
{ 'n', 'z=', builtin.spell_suggest },

-- lsp
{ 'n', 'gd', builtin.lsp_definitions },
{ 'n', 'gr', builtin.lsp_references },
{ 'n', 'gi', builtin.lsp_implementations },
{ 'n', 'gd', builtin.lsp_definitions },
{ 'n', 'gr', builtin.lsp_references },
{ 'n', 'gi', builtin.lsp_implementations },
{
'n',
'<Leader>fg',
Expand All @@ -144,24 +148,24 @@ require('v.utils.mappings').set_keybindings({
{ 'n', '<Leader>fgw', builtin.diagnostics },

-- git
{ 'n', '<Leader>gb', builtin.git_branches },
{ 'n', '<Leader>gc', builtin.git_commits },
{ 'n', '<Leader>gb', builtin.git_branches },
{ 'n', '<Leader>gc', builtin.git_commits },

-- extensions
{ 'n', '<Leader>fh', telescope.extensions.heading.heading },
{ 'n', '<Leader>fh', telescope.extensions.heading.heading },
{
'n',
'<Leader>fs',
[[<cmd>lua require('telescope').extensions['session-lens'].search_session()<cr>]],
},

-- custom functions
{ 'n', '<leader>fn', utils.find_nvim },
{ 'n', '<leader>fk', utils.find_in_plugins },
{ 'n', '<leader>fd', utils.find_dotfiles },
{ 'n', '<leader>f/', utils.grep_last_search },
{ 'n', '<leader>fu', utils.find_unimed },
{ 'n', '<leader>fw', utils.find_work },
{ 'n', '<leader>fn', utils.find_nvim },
{ 'n', '<leader>fk', utils.find_in_plugins },
{ 'n', '<leader>fd', utils.find_dotfiles },
{ 'n', '<leader>f/', utils.grep_last_search },
{ 'n', '<leader>fu', utils.find_unimed },
{ 'n', '<leader>fw', utils.find_work },
{ 'n', '<leader>fpu', utils.grep_unimed },

-- code actions
Expand Down

0 comments on commit a3dd708

Please sign in to comment.