This commit is contained in:
Christian Nieves
2023-03-20 15:47:17 -05:00
parent fcbb91f25e
commit 5a14fe163c
5 changed files with 78 additions and 13 deletions

View File

@ -41,8 +41,8 @@ end
local map = require("utils").map
-- here are some mappings you might want:
map('n', '[c', [[<Cmd>GoogleCommentsGotoNextComment<CR>]])
map('n', ']c', [[<Cmd>GoogleCommentsGotoPrevComment<CR>]])
map('n', ']c', [[<Cmd>GoogleCommentsGotoNextComment<CR>]])
map('n', '[c', [[<Cmd>GoogleCommentsGotoPrevComment<CR>]])
map('n', '<Leader>nc', [[<Cmd>GoogleCommentsGotoNextComment<CR>]])
map('n', '<Leader>pc', [[<Cmd>GoogleCommentsGotoPrevComment<CR>]])

View File

@ -1,3 +1,3 @@
local map = require("utils").map
map("n", "<Leader>y", ":OSCYank<CR>", opts)
map("v", "<Leader>y", ":OSCYank<CR>", opts)
vim.keymap.set('n', '<leader>y', require('osc52').copy_operator, {expr = true})
vim.keymap.set('n', '<leader>yy', '<leader>c_', {remap = true})
vim.keymap.set('v', '<leader>y', require('osc52').copy_visual)

View File

@ -1,4 +1,8 @@
local map = require("utils").map
vim.g.signify_vcs_cmds = {
hg = 'hg cat %f -r p4base',
}
map('n', ']d', '<plug>(signify-next-hunk)')
map('n', '[d', '<plug>(signify-prev-hunk)')

View File

@ -220,12 +220,13 @@ require('packer').startup(function(use)
config = [[require('config.gitsigns')]],
event = 'User ActuallyEditing',
},
{ 'TimUntersberger/neogit', cmd = 'Neogit', config = [[require('config.neogit')]] },
-- { 'TimUntersberger/neogit', cmd = 'Neogit', config = [[require('config.neogit')]] },
{
'akinsho/git-conflict.nvim',
tag = '*',
config = [[require('git-conflict').setup()]]
}
},
{ 'rhysd/conflict-marker.vim' }
}
-- use { "catppuccin/nvim", as = "catppuccin" }
@ -237,10 +238,11 @@ require('packer').startup(function(use)
'christoomey/vim-tmux-navigator',
'whatyouhide/vim-tmux-syntax',
'tmux-plugins/vim-tmux-focus-events',
'jabirali/vim-tmux-yank',
'skywind3000/asyncrun.vim',
}
use {
'ojroques/vim-oscyank',
'ojroques/nvim-osc52',
config = [[ require("config.oscyank") ]]
}
@ -278,7 +280,8 @@ require('packer').startup(function(use)
use 'tpope/vim-surround'
use 'scrooloose/nerdcommenter'
use 'mhinz/vim-signify' {
use {
'mhinz/vim-signify',
config= [[require('config.signify')]]
}