1
0
mirror of https://github.com/jdhao/nvim-config.git synced 2025-06-08 14:14:33 +02:00

Compare commits

...

3 Commits

Author SHA1 Message Date
jdhao
a602d98819 fix git mapping issue
`<cmd> `mapping must end with `<CR>`
2024-08-09 22:23:04 +02:00
jdhao
9ff76931e3 update git related mappings 2024-08-09 22:19:13 +02:00
jdhao
85232b82a8 Update mapping of plugin open-browser.vim 2024-08-09 22:05:54 +02:00
3 changed files with 28 additions and 12 deletions

View File

@ -1,12 +1,27 @@
local keymap = vim.keymap local keymap = vim.keymap
keymap.set("n", "<leader>gs", "<cmd>Git<cr>", { desc = "Git status" }) keymap.set("n", "<leader>gs", "<cmd>Git<cr>", { desc = "Git: show status" })
keymap.set("n", "<leader>gw", "<cmd>Gwrite<cr>", { desc = "Git add" }) keymap.set("n", "<leader>gw", "<cmd>Gwrite<cr>", { desc = "Git: add file" })
keymap.set("n", "<leader>gc", "<cmd>Git commit<cr>", { desc = "Git commit" }) keymap.set("n", "<leader>gc", "<cmd>Git commit<cr>", { desc = "Git: commit changes" })
keymap.set("n", "<leader>gd", "<cmd>Gdiffsplit<cr>", { desc = "Git diff" }) keymap.set("n", "<leader>gpl", "<cmd>Git pull<cr>", { desc = "Git: pull changes" })
keymap.set("n", "<leader>gpl", "<cmd>Git pull<cr>", { desc = "Git pull" }) keymap.set("n", "<leader>gpu", "<cmd>15 split|term git push<cr>", { desc = "Git: push changes" })
keymap.set("n", "<leader>gpu", "<cmd>15 split|term git push<cr>", { desc = "Git push" }) keymap.set("v", "<leader>gb", ":Git blame<cr>", { desc = "Git: blame selected line" })
keymap.set("v", "<leader>gb", ":Git blame<cr>", { desc = "Git blame line" })
-- convert git to Git in command line mode -- convert git to Git in command line mode
vim.fn["utils#Cabbrev"]("git", "Git") vim.fn["utils#Cabbrev"]("git", "Git")
keymap.set("n", "<leader>gnb", function()
vim.ui.input({ prompt = "Enter the new branch nmae" }, function(user_input)
if user_input == nil or user_input == "" then
return
end
local cmd_str = string.format("G checkout -b %s", user_input)
vim.cmd(cmd_str)
end)
end, {
desc = "Git: create new branch",
})
keymap.set("n", "<leader>gf", ":Git fetch ", { desc = "Git: prune branches" })
keymap.set("n", "<leader>gbd", ":Git branch -D ", { desc = "Git: delete branch" })

View File

@ -24,14 +24,14 @@ keymap.set({ "n", "v" }, "<leader>gl", function()
gitlinker.get_buf_range_url(mode) gitlinker.get_buf_range_url(mode)
end, { end, {
silent = true, silent = true,
desc = "get git permlink", desc = "Git: get permlink",
}) })
keymap.set("n", "<leader>gb", function() keymap.set("n", "<leader>gbr", function()
gitlinker.get_repo_url({ gitlinker.get_repo_url({
action_callback = gitlinker.actions.open_in_browser action_callback = gitlinker.actions.open_in_browser
}) })
end, { end, {
silent = true, silent = true,
desc = "browse repo in browser", desc = "Git: browse repo in browser",
}) })

View File

@ -119,8 +119,9 @@ if g:is_win || g:is_mac
let g:netrw_nogx = 1 let g:netrw_nogx = 1
" Use another mapping for the open URL method " Use another mapping for the open URL method
nmap ob <Plug>(openbrowser-smart-search) nmap <leader>ob <Plug>(openbrowser-smart-search)
xmap ob <Plug>(openbrowser-smart-search) xmap <leader>ob <Plug>(openbrowser-smart-search)
nmap ob <cmd>echoerr "Use <leader>ob instead!"<CR>
endif endif
""""""""""""""""""""""""""" vista settings """""""""""""""""""""""""""""""""" """"""""""""""""""""""""""" vista settings """"""""""""""""""""""""""""""""""