diff --git a/nix/hm/jj.nix b/nix/hm/jj.nix index 40de9c9c..286890be 100644 --- a/nix/hm/jj.nix +++ b/nix/hm/jj.nix @@ -11,6 +11,7 @@ in { home.packages = [ # pkgs.diffedit3 + pkgs.gg-jj ]; programs.fish.shellAliases = { jl = "jj log -n 8"; @@ -81,6 +82,11 @@ in "-r" "(master..@):: | (master..@)-" ]; + lr = [ + "log" + "-r" + "working()" + ]; lmain = [ "log" "-r" @@ -479,6 +485,8 @@ in "archived()" = "(mine() & description(regex:'^archive($|:)'))::"; "unarchived(x)" = "x ~ archived()"; "diverge(x)" = "fork_point(x)::x"; + # "working()" = "visible_heads() | ancestors(visible_heads(), 2)"; + "working()" = "ancestors(visible_heads() & mutable(), 2)"; }; colors = { git_head = {