cschmatzler/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use jj properly

Browse Source
This commit is contained in:
Christoph Schmatzler
2026-03-10 14:09:03 +00:00
parent 0b882455f8
commit f896135f36
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/_neovim/mappings.nix
View File

@@ -143,8 +143,12 @@
{ {
mode = "n"; mode = "n";
key = "<leader>vD"; key = "<leader>vD";
action = ":DiffviewOpen<CR>"; action.__raw = ''
options.desc = "Diffview (all changes)"; function()
require('jj.diff').show_revision({})
end
'';
options.desc = "Diff (all changes)";
} }
{ {
mode = "n"; mode = "n";
@@ -175,14 +179,12 @@
{ {
mode = "n"; mode = "n";
key = "<leader>vh"; key = "<leader>vh";
action = ":DiffviewFileHistory %<CR>"; action.__raw = ''
options.desc = "File history"; function()
} require('jj.diff').show_revision({ rev = '@-' })
{ end
mode = "n"; '';
key = "<leader>vH"; options.desc = "Diff parent revision";
action = ":DiffviewFileHistory<CR>";
options.desc = "Branch history";
} }
{ {
mode = "n"; mode = "n";
@@ -219,8 +221,12 @@
{ {
mode = "n"; mode = "n";
key = "<leader>vR"; key = "<leader>vR";
action = ":DiffviewOpen origin/main...HEAD --imply-local<CR>"; action.__raw = ''
options.desc = "Review bookmark"; function()
require('jj.diff').diff_revisions({ left = 'trunk()', right = '@' })
end
'';
options.desc = "Review bookmark (trunk..@)";
} }
{ {
mode = "n"; mode = "n";