plumjam/nixos - Change UDMIMNC47TNUHDGEKHD43MTZKGXVHZANX233UVMMS2AMUV53X2KQC

dendritic: Migrate jujutsu config.

Created by PlumJam on January 10, 2026

UDMIMNC47TNUHDGEKHD43MTZKGXVHZANX233UVMMS2AMUV53X2KQC

Dependencies

In channels

main

Change contents

File addition: jujutsu.nix (----------)

[7.2]

let
  commonModule =
    { pkgs, ... }:
    {
      environment.systemPackages = [
        pkgs.jujutsu
        pkgs.difftastic
        pkgs.mergiraf
      ];
    };
in
{
  config.flake.modules.hjem.jujutsu =
    { pkgs, config, ... }:
    let
      toml = pkgs.formats.toml { };
      jjConfig = {
        user.name = "PlumJam";
        user.email = "git@plumj.am";
        signing.key = "/home/jam/.ssh/id";
        signing.backend = "ssh";
        signing.behavior = "own";
        ui.conflict-marker-style = "snapshot";
        ui.default-command = "lg";
        ui.diff-editor = ":builtin";
        ui.diff-formatter = [
          "difft"
          "--color"
          "always"
          "$left"
          "$right"
        ];
        ui.editor = config.environment.sessionVariables.EDITOR;
        ui.graph-style = "square";
        ui.movement.edit = true;
        ui.pager = ":builtin";
        snapshot.max-new-file-size = "10MiB";
        lazyjj.highlight-color = "#f2e5bc";
        git.sign-on-push = true; # sign in bulk on push
        remotes.origin.auto-track-bookmarks = "glob:*";
        git.subprocess = true;
        git.fetch = [ "origin" ];
        git.push = "origin";
        aliases.".." = [
          "edit"
          "@-"
        ];
        aliases.",," = [
          "edit"
          "@+"
        ];
        aliases.a = [ "abandon" ];
        aliases.b = [ "bookmark" ];
        aliases.bs = [
          "bookmark"
          "set"
        ];
        aliases.bc = [
          "bookmark"
          "create"
        ];
        aliases.c = [ "commit" ];
        aliases.ci = [
          "commit"
          "--interactive"
        ];
        aliases.e = [ "edit" ];
        aliases.fetch = [
          "git"
          "fetch"
        ];
        aliases.f = [
          "git"
          "fetch"
        ];
        aliases.r = [ "rebase" ];
        aliases.res = [ "resolve" ];
        aliases.resolve-ast = [
          "resolve"
          "--tool"
          "mergiraf"
        ];
        aliases.resa = [ "resolve-ast" ];
        aliases.s = [ "split" ];
        aliases.sm = [
          "split"
          "--message"
        ];
        aliases.sq = [ "squash" ];
        aliases.sqf = [
          "squash"
          "--from"
        ];
        aliases.sqi = [
          "squash"
          "--interactive"
        ];
        aliases.sqm = [
          "squash"
          "--message"
        ];
        aliases.sqmi = [
          "squash"
          "--interactive"
          "--message"
        ];
        aliases.sh = [ "show" ];
        aliases.tug = [
          "bookmark"
          "move"
          "--from"
          "closest(@-)"
          "--to"
          "closest_pushable(@)"
        ];
        aliases.t = [ "tug" ];
        aliases.push = [
          "git"
          "push"
        ];
        aliases.p = [
          "git"
          "push"
        ];
        aliases.pb = [
          "git"
          "push"
          "--bookmark"
        ];
        aliases.init = [
          "git"
          "init"
          "--colocate"
        ];
        aliases.i = [
          "git"
          "init"
          "--colocate"
        ];
        aliases.clone = [
          "git"
          "clone"
          "--colocate"
        ];
        aliases.cl = [
          "git"
          "clone"
          "--colocate"
        ];
        aliases.d = [ "diff" ];
        aliases.ds = [ "diff --stat" ];
        aliases.l = [ "log" ];
        aliases.la = [
          "log"
          "--revisions"
          "::"
        ];
        aliases.ls = [
          "log"
          "--summary"
        ];
        aliases.lsa = [
          "log"
          "--summary"
          "--revisions"
          "::"
        ];
        aliases.lp = [
          "log"
          "--patch"
        ];
        aliases.lpa = [
          "log"
          "--patch"
          "--revisions"
          "::"
        ];
        aliases.lg = [
          "log"
          "--summary"
          "--no-pager"
          "--limit=4"
        ];
        aliases.el = [ "evolog" ];
        aliases.ol = [
          "op"
          "log"
        ];
        revset-aliases."closest(to)" = "heads(::to & bookmarks())";
        revset-aliases."closest_pushable(to)" =
          "heads(::to & ~description(exact:\"\") & (~empty() | merges()))";
        revsets.log = "present(@) | present(trunk()) | ancestors(remote_bookmarks().. | @.., 8)";
        templates.draft_commit_description = /* python */ ''
          concat(
            coalesce(description, "\n"),
            surround(
              "\nJJ: This commit contains the following changes:\n", "",
              indent("JJ:     ", diff.stat(72)),
            ),
            "\nJJ: ignore-rest\n",
            diff.git(),
          )
        '';
        templates.git_push_bookmark = /* python */ ''
          "change/PlumJam-" ++ change_id.short()
        '';
      };
    in
    {
      xdg.config.files."jj/config.toml" = {
        source = toml.generate "config.toml" jjConfig;
      };
      rum.programs.nushell.aliases = {
        j = "jj";
        lj = "lazyjj";
        ju = "jjui";
      };
    };
  config.flake.modules.nixos.jujutsu-extra = commonModule;
  config.flake.modules.darwin.jujutsu-extra = commonModule;
}

File deletion: jujutsu.nix, jujutsu.nix, jujutsu.nix

BFD:BFD[8.18852] → [9.737:772]

BF:BFD[9.772] → [9.54:54]

BFD:BFD[10.787] → [10.915:950]

BF:BFD[10.950] → [9.54:54]

BF:BFD[10.9] → [11.2573:2608]

BF:BFD[11.2608] → [9.54:54]

∅:D[12.2297] → [13.477:478]

B:BD[13.477] → [13.477:478]

∅:D[12.2738] → [14.29:30]

B:BD[15.424] → [14.29:30]

∅:D[14.73] → [13.761:762]

∅:D[16.108] → [13.761:762]

∅:D[17.302] → [13.761:762]

∅:D[15.424] → [13.761:762]

∅:D[12.2787] → [13.761:762]

B:BD[13.761] → [13.761:762]

∅:D[2.204] → [13.861:862]

∅:D[12.2942] → [13.861:862]

B:BD[13.861] → [13.861:862]

∅:D[15.544] → [13.932:933]

∅:D[12.2976] → [13.932:933]

B:BD[13.932] → [13.932:933]

∅:D[3.121] → [12.3023:3055]

B:BD[12.3023] → [12.3023:3055]

∅:D[15.578] → [13.963:964]

∅:D[12.3055] → [13.963:964]

B:BD[13.963] → [13.963:964]

∅:D[15.661] → [13.1040:1041]

∅:D[12.3140] → [13.1040:1041]

B:BD[13.1040] → [13.1040:1041]

∅:D[6.241] → [13.1068:1069]

∅:D[15.692] → [13.1068:1069]

∅:D[12.3178] → [13.1068:1069]

B:BD[13.1068] → [13.1068:1069]

∅:D[15.775] → [13.1145:1146]

∅:D[12.3269] → [13.1145:1146]

B:BD[13.1145] → [13.1145:1146]

∅:D[15.808] → [13.1175:1176]

∅:D[12.3304] → [13.1175:1176]

B:BD[13.1175] → [13.1175:1176]

∅:D[15.962] → [13.1320:1321]

∅:D[12.3395] → [13.1320:1321]

B:BD[13.1320] → [13.1320:1321]

∅:D[18.453] → [13.1397:1398]

∅:D[15.1235] → [13.1397:1398]

∅:D[12.3598] → [13.1397:1398]

B:BD[13.1397] → [13.1397:1398]

∅:D[6.278] → [12.3634:3682]

B:BD[12.3634] → [12.3634:3682]

∅:D[15.1267] → [13.1426:1427]

∅:D[12.3682] → [13.1426:1427]

B:BD[13.1426] → [13.1426:1427]

∅:D[15.1394] → [13.1547:1548]

∅:D[12.3943] → [13.1547:1548]

B:BD[13.1547] → [13.1547:1548]

∅:D[19.87] → [13.1626:1627]

∅:D[12.3979] → [13.1626:1627]

B:BD[13.1626] → [13.1626:1627]

∅:D[15.1448] → [13.1730:1731]

∅:D[12.4114] → [13.1730:1731]

B:BD[13.1730] → [13.1730:1731]

∅:D[6.335] → [13.1836:1837]

∅:D[15.1503] → [13.1836:1837]

∅:D[12.4201] → [13.1836:1837]

B:BD[13.1836] → [13.1836:1837]

∅:D[18.484] → [13.1868:1869]

∅:D[12.4316] → [13.1868:1869]

B:BD[13.1868] → [13.1868:1869]

∅:D[5.185] → [13.2153:2154]

∅:D[20.197] → [13.2153:2154]

∅:D[15.1702] → [13.2153:2154]

∅:D[12.4468] → [13.2153:2154]

B:BD[13.2153] → [13.2153:2154]

∅:D[12.4930] → [13.2338:2339]

B:BD[13.2338] → [13.2338:2339]

∅:D[18.581] → [13.2440:2441]

∅:D[12.5126] → [13.2440:2441]

B:BD[13.2440] → [13.2440:2441]

∅:D[12.5227] → [13.2798:2799]

B:BD[13.2798] → [13.2798:2799]

∅:D[12.5612] → [13.2911:2912]

B:BD[13.2911] → [13.2911:2912]

∅:D[21.585] → [9.734:736]

∅:D[22.3265] → [9.734:736]

B:BD[9.734] → [9.734:736]

∅:D[12.5745] → [21.564:585]

B:BD[21.564] → [21.564:585]

B:BD[13.2912] → [12.5613:5745]

B:BD[13.2799] → [12.5228:5612]

B:BD[13.2441] → [12.5127:5227]

B:BD[13.2339] → [12.4931:5126]

B:BD[13.2154] → [12.4469:4930]

B:BD[13.1869] → [12.4317:4434]

B:BD[12.4434] → [5.108:185]

B:BD[13.1837] → [12.4202:4316]

B:BD[13.1731] → [12.4115:4201]

B:BD[12.4201] → [6.279:335]

B:BD[13.1627] → [12.3980:4114]

B:BD[13.1548] → [12.3944:3979]

B:BD[13.1427] → [12.3683:3943]

B:BD[13.1398] → [6.242:278]

∅:D[15.1038] → [18.268:269]

∅:D[12.3432] → [18.268:269]

B:BD[18.268] → [18.268:269]

B:BD[18.269] → [12.3433:3598]

B:BD[13.1321] → [12.3396:3432]

B:BD[13.1176] → [12.3305:3395]

B:BD[13.1146] → [12.3270:3304]

B:BD[13.1069] → [12.3179:3269]

B:BD[13.1041] → [12.3141:3178]

B:BD[12.3178] → [6.109:241]

B:BD[13.964] → [12.3056:3140]

B:BD[13.933] → [3.85:121]

B:BD[13.862] → [12.2943:2976]

∅:D[2.145] → [23.117:118]

∅:D[15.467] → [23.117:118]

∅:D[12.2834] → [23.117:118]

B:BD[23.117] → [23.117:118]

B:BD[23.118] → [2.146:204]

B:BD[13.762] → [12.2788:2834]

B:BD[12.2834] → [2.86:145]

B:BD[14.30] → [12.2739:2787]

B:BD[13.478] → [12.2298:2738]

∅:D[12.155] → [13.80:85]

B:BD[13.80] → [13.80:85]

∅:D[24.689] → [13.123:124]

∅:D[22.3046] → [13.123:124]

∅:D[25.8970] → [13.123:124]

B:BD[13.123] → [13.123:124]

∅:D[17.257] → [13.161:162]

∅:D[21.483] → [13.161:162]

∅:D[12.2146] → [13.161:162]

∅:D[22.3153] → [13.161:162]

B:BD[13.161] → [13.161:162]

B:BD[13.162] → [12.2147:2297]

B:BD[13.124] → [21.76:115]

∅:D[17.131] → [21.156:191]

B:BD[21.156] → [21.156:191]

∅:D[12.1995] → [21.191:359]

B:BD[21.191] → [21.191:359]

B:BD[21.359] → [12.1996:2146]

B:BD[21.115] → [17.93:131]

B:BD[13.85] → [26.563:609]

∅:D[4.129] → [26.609:628]

∅:D[24.580] → [26.609:628]

B:BD[26.609] → [26.609:628]

∅:D[24.598] → [26.628:634]

B:BD[26.628] → [26.628:634]

B:BD[26.634] → [24.599:689]

B:BD[26.628] → [24.581:598]

B:BD[26.609] → [4.85:129]

B:BD[9.54] → [12.89:121]

∅:D[27.111] → [12.154:155]

∅:D[24.539] → [12.154:155]

B:BD[12.154] → [12.154:155]

B:BD[12.121] → [24.509:539]


          git.push  = "origin";
          aliases.sm = [ "split" "--message" ];
}
      };
    })
  ];
          templates.git_push_bookmark = /* python */ ''
            "change/PlumJam-" ++ change_id.short()
          '';
        };
          templates.draft_commit_description = /* python */ ''
            concat(
              coalesce(description, "\n"),
              surround(
                "\nJJ: This commit contains the following changes:\n", "",
                indent("JJ:     ", diff.stat(72)),
              ),
              "\nJJ: ignore-rest\n",
              diff.git(),
            )
          '';
          revsets.log = "present(@) | present(trunk()) | ancestors(remote_bookmarks().. | @.., 8)";
          revset-aliases."closest(to)"          = "heads(::to & bookmarks())";
          revset-aliases."closest_pushable(to)" = "heads(::to & ~description(exact:\"\") & (~empty() | merges()))";
          aliases.l   = [ "log" ];
          aliases.la  = [ "log" "--revisions" "::" ];
          aliases.ls  = [ "log" "--summary" ];
          aliases.lsa = [ "log" "--summary" "--revisions" "::" ];
          aliases.lp  = [ "log" "--patch" ];
          aliases.lpa = [ "log" "--patch" "--revisions" "::" ];
          aliases.lg  = [ "log" "--summary" "--no-pager" "--limit=4" ];
          aliases.el  = [ "evolog" ];
          aliases.ol  = [ "op" "log" ];
          aliases.clone = [ "git" "clone" "--colocate" ];
          aliases.cl    = [ "git" "clone" "--colocate" ];
          aliases.d  = [ "diff" ];
          aliases.ds = [ "diff --stat" ];
          aliases.init  = [ "git" "init" "--colocate" ];
          aliases.i     = [ "git" "init" "--colocate" ];
          aliases.push = [ "git" "push" ];
          aliases.p    = [ "git" "push" ];
          aliases.pb   = [ "git" "push" "--bookmark" ];
          aliases.tug = [ "bookmark" "move" "--from" "closest(@-)" "--to" "closest_pushable(@)" ];
          aliases.t   = [ "tug" ];
          aliases.sh = [ "show" ];
          aliases.sq   = [ "squash" ];
          aliases.sqf  = [ "squash" "--from" ];
          aliases.sqi  = [ "squash" "--interactive" ];
          aliases.sqm  = [ "squash" "--message" ];
          aliases.sqmi = [ "squash" "--interactive" "--message" ];
          aliases.s  = [ "split" ];
          aliases.res         = [ "resolve" ];
          aliases.resolve-ast = [ "resolve" "--tool" "mergiraf" ];
          aliases.resa        = [ "resolve-ast" ];
          aliases.r = [ "rebase" ];
          aliases.fetch = [ "git" "fetch" ];
          aliases.f     = [ "git" "fetch" ];
          aliases.e = [ "edit" ];
          aliases.c  = [ "commit" ];
          aliases.ci = [ "commit" "--interactive" ];
          aliases.a = [ "abandon" ];
          aliases.b = [ "bookmark" ];
          aliases.bs = [ "bookmark" "set" ];
          aliases.bc = [ "bookmark" "create" ];
          aliases.".." = [ "edit" "@-" ];
          aliases.",," = [ "edit" "@+" ];
          git.fetch = [ "origin" ];
          git.subprocess = true;
          remotes.origin.auto-track-bookmarks = "glob:*";
          lazyjj.highlight-color = "#f2e5bc";
          git.sign-on-push = true; # sign in bulk on push
          snapshot.max-new-file-size = "10MiB";
          ui.conflict-marker-style = "snapshot";
          ui.default-command       = "lg";
          ui.diff-editor           = ":builtin";
          ui.diff-formatter        = [ "difft" "--color" "always" "$left" "$right" ];
          ui.editor                = config.environment.variables.EDITOR;
          ui.graph-style           = "square";
          ui.movement.edit         = true;
          ui.pager                 = ":builtin";
in {
          signing.key      = "${homeArgs.config.home.homeDirectory}/.ssh/id";
          signing.backend  = "ssh";
          signing.behavior = "own";
  home-manager.sharedModules = [
    {
      programs.mergiraf = enabled;
    }
    (homeArgs: let
      config' = homeArgs.config;
    in {
      # credit to https://github.com/rgbcube/ncc for most of this
      programs.jujutsu = enabled {
        settings = {
          user.name  = config'.programs.git.settings.user.name;
          user.email = config'.programs.git.settings.user.email;
      programs.difftastic = enabled;
  environment.shellAliases = {
    j  = "jj";
    lj = "lazyjj";
  };
  environment.systemPackages = mkIf config.isDesktop [
    pkgs.lazyjj
    pkgs.jjui
  ];
    ju = "jjui";
  } // lib.optionalAttrs config.isDesktop {
{ config, pkgs, lib, ... }: let
  inherit (lib) enabled mkIf;