steve/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(nvim): update plugins and config

Browse Source
This commit is contained in:
gitadmin
2026-04-24 20:42:17 -04:00
parent 45dceba337
commit 2aff2eb423
14 changed files with 251 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/nvim/plugin/jj.lua
+25 -23
View File
@@ -2,33 +2,33 @@
local cmd = require("jj.cmd")
local annotate = require("jj.annotate")
vim.keymap.set("n", "<leader>va", annotate.file, { desc = "JJ annotate file" })
vim.keymap.set("n", "<leader>vA", annotate.line, { desc = "JJ annotate line" })
vim.keymap.set("n", "<leader>vbc", cmd.bookmark_create, { desc = "JJ bookmark create" })
vim.keymap.set("n", "<leader>vbd", cmd.bookmark_delete, { desc = "JJ bookmark delete" })
vim.keymap.set("n", "<leader>vbm", cmd.bookmark_move, { desc = "JJ bookmark move" })
vim.keymap.set("n", "<leader>vd", cmd.describe, { desc = "JJ describe" })
vim.keymap.set("n", "<leader>vl", cmd.log, { desc = "JJ log" })
vim.keymap.set("n", "<leader>ve", cmd.edit, { desc = "JJ edit" })
vim.keymap.set("n", "<leader>vn", cmd.new, { desc = "JJ new" })
vim.keymap.set("n", "<leader>vs", cmd.status, { desc = "JJ status" })
vim.keymap.set("n", "<leader>vS", cmd.squash, { desc = "JJ squash" })
vim.keymap.set("n", "<leader>vju", cmd.undo, { desc = "JJ undo" })
vim.keymap.set("n", "<leader>vjr", cmd.redo, { desc = "JJ redo" })
vim.keymap.set("n", "<leader>vr", cmd.rebase, { desc = "JJ rebase" })
vim.keymap.set("n", "<leader>vf", cmd.fetch, { desc = "JJ fetch" })
vim.keymap.set("n", "<leader>vx", cmd.abandon, { desc = "JJ abandon" })
vim.keymap.set("n", "<leader>vp", cmd.push, { desc = "JJ push" })
vim.keymap.set("n", "<leader>vpr", cmd.open_pr, { desc = "JJ open PR from bookmark in current revision or parent" })
vim.keymap.set("n", "<leader>vpl", function()
vim.keymap.set("n", "<leader>vja", annotate.file, { desc = "JJ annotate file" })
vim.keymap.set("n", "<leader>vjA", annotate.line, { desc = "JJ annotate line" })
vim.keymap.set("n", "<leader>vjbc", cmd.bookmark_create, { desc = "JJ bookmark create" })
vim.keymap.set("n", "<leader>vjbd", cmd.bookmark_delete, { desc = "JJ bookmark delete" })
vim.keymap.set("n", "<leader>vjbm", cmd.bookmark_move, { desc = "JJ bookmark move" })
vim.keymap.set("n", "<leader>vjd", cmd.describe, { desc = "JJ describe" })
vim.keymap.set("n", "<leader>vjl", cmd.log, { desc = "JJ log" })
vim.keymap.set("n", "<leader>vje", cmd.edit, { desc = "JJ edit" })
vim.keymap.set("n", "<leader>vjn", cmd.new, { desc = "JJ new" })
--vim.keymap.set("n", "<leader>vjs", cmd.status, { desc = "JJ status" })
vim.keymap.set("n", "<leader>vjS", cmd.squash, { desc = "JJ squash" })
vim.keymap.set("n", "<leader>vjju", cmd.undo, { desc = "JJ undo" })
vim.keymap.set("n", "<leader>vjr", cmd.rebase, { desc = "JJ rebase" })
vim.keymap.set("n", "<leader>vjR", cmd.redo, { desc = "JJ redo" })
vim.keymap.set("n", "<leader>vjf", cmd.fetch, { desc = "JJ fetch" })
vim.keymap.set("n", "<leader>vjx", cmd.abandon, { desc = "JJ abandon" })
vim.keymap.set("n", "<leader>vjpp", cmd.push, { desc = "JJ push" })
vim.keymap.set("n", "<leader>vjpr", cmd.open_pr, { desc = "JJ open PR from bookmark in current revision or parent" })
vim.keymap.set("n", "<leader>vjpl", function()
cmd.open_pr { list_bookmarks = true }
end, { desc = "JJ open PR listing available bookmarks" })
-- Diff commands
local diff = require("jj.diff")
vim.keymap.set("n", "<leader>vjd", function() diff.open_vdiff() end, { desc = "JJ diff current buffer" })
vim.keymap.set("n", "<leader>vjD", function() diff.open_hsplit() end, { desc = "JJ hdiff current buffer" })
vim.keymap.set("n", "<leader>vjdv", function() diff.open_vdiff() end, { desc = "JJ diff current buffer" })
vim.keymap.set("n", "<leader>vjdh", function() diff.open_hsplit() end, { desc = "JJ hdiff current buffer" })
-- Pickers
local picker = require("jj.picker")
@@ -36,7 +36,7 @@ vim.keymap.set("n", "<leader>vjs", function() picker.status() end, { desc = "JJ
vim.keymap.set("n", "<leader>vjh", function() picker.file_history() end, { desc = "JJ Picker history" })
-- Some functions like `log` can take parameters
vim.keymap.set("n", "<leader>vL", function()
vim.keymap.set("n", "<leader>vjL", function()
cmd.log {
revisions = "all()", -- equivalent to jj log -r ::
}
@@ -44,7 +44,7 @@ end, { desc = "JJ log all" })
-- This is an alias i use for moving bookmarks its so good
vim.keymap.set("n", "<leader>vt", function()
vim.keymap.set("n", "<leader>vjt", function()
cmd.j "tug"
cmd.log {}
end, { desc = "JJ tug" })
@@ -74,3 +74,5 @@ require('jjsigns').setup({
auto = false,
}
})
vim.keymap.set("n", "<leader>uJ", function() require('jjsigns').toggle() end, { desc = "Toggle JJ signs" })