RGBCube/ncc
1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-29 11:07:44 +00:00
Code Issues Activity

jujutsu: use mergiraf and add abandon alias

Browse source
This commit is contained in:
RGBCube 2025-06-04 00:14:03 +03:00
parent 7302727cfc
commit 6383b15bca
Signed by: RGBCube
SSH key fingerprint: SHA256:CzqbPcfwt+GxFYNnFVCqoN5Itn4YFrshg1TrnACpA5M
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/common/jujutsu.nix
View file

@ -1,9 +1,10 @@
{ self, config, lib, pkgs, ... }: let { self, config, lib, pkgs, ... }: let
inherit (lib) attrValues enabled getExe head mkIf; inherit (lib) attrValues enabled head mkIf;
in { in {
environment.systemPackages = attrValues { environment.systemPackages = attrValues {
inherit (pkgs) inherit (pkgs)
difftastic difftastic
mergiraf
radicle-node radicle-node
; ;
}; };
@ -31,20 +32,27 @@ in {
aliases.init = [ "git" "init" "--colocate" ]; aliases.init = [ "git" "init" "--colocate" ];
aliases.i = [ "git" "init" "--colocate" ]; aliases.i = [ "git" "init" "--colocate" ];
aliases.a = [ "abandon" ];
aliases.c = [ "commit" ]; aliases.c = [ "commit" ];
aliases.ci = [ "commit" "--interactive" ]; aliases.ci = [ "commit" "--interactive" ];
aliases.e = [ "edit" ];
aliases.r = [ "rebase" ];
aliases.s = [ "squash" ];
aliases.si = [ "squash" "--interactive" ];
aliases.d = [ "diff" ]; aliases.d = [ "diff" ];
aliases.e = [ "edit" ];
aliases.l = [ "log" ]; aliases.l = [ "log" ];
aliases.ls = [ "log" "--summary" ]; aliases.ls = [ "log" "--summary" ];
aliases.la = [ "log" "--revisions" "::" ]; aliases.la = [ "log" "--revisions" "::" ];
aliases.r = [ "rebase" ];
aliases.resolve-ast = [ "resolve" "--tool" "mergiraf" ];
aliases.rs = [ "resolve-ast" ];
aliases.s = [ "squash" ];
aliases.si = [ "squash" "--interactive" ];
aliases.tug = [ "bookmark" "move" "--from" "closest(@-)" "--to" "closest_pushable(@)" ]; aliases.tug = [ "bookmark" "move" "--from" "closest(@-)" "--to" "closest_pushable(@)" ];
revset-aliases."closest(to)" = "heads(::to & bookmarks())"; revset-aliases."closest(to)" = "heads(::to & bookmarks())";
@ -55,7 +63,7 @@ in {
ui.default-command = "ls"; ui.default-command = "ls";
ui.diff-editor = ":builtin"; ui.diff-editor = ":builtin";
ui.diff.tool = [ "${getExe pkgs.difftastic}" "--color" "always" "$left" "$right" ]; ui.diff.tool = [ "difft" "--color" "always" "$left" "$right" ];
ui.conflict-marker-style = "snapshot"; ui.conflict-marker-style = "snapshot";
ui.graph.style = if config.theme.cornerRadius > 0 then "curved" else "square"; ui.graph.style = if config.theme.cornerRadius > 0 then "curved" else "square";