plumjam/nixos - Change 7XUY3NXFXDI44RGNNXP4A72ECRHKF3R62GG53PEZZF3XUNXMRKKAC

jujutsu: Script for pushing to 2+ remotes and fix indentation.

Created by PlumJam on November 8, 2025

7XUY3NXFXDI44RGNNXP4A72ECRHKF3R62GG53PEZZF3XUNXMRKKAC

Dependencies

In channels

main

Change contents

Replacement in modules/common/jujutsu.nix at line 1 [6.54]
B:BD[6.54] → [7.524:562]
∅:D[7.562] → [8.55:80]
B:BD[8.55] → [8.55:80]
```
{ config, pkgs, lib, keys, ... }: let
  inherit (lib) enabled;
```
[6.54]
[8.80]
```
{ config, pkgs, lib, ... }: let
  inherit (lib) enabled mkAfter;
```

Insertion in modules/common/jujutsu.nix at line 17 [6.54]

[9.191]


      programs.nushell.configFile.text = mkAfter /* nu */ ''
        def --wrapped jpa [
          --revisions (-r): string = "@" # The revision(s) to pass to `jj git push`
          ...rest: string # Any other args to pass to `jj git push`
        ] {
          let remotes       = ["origin" "forgejo"]
          let remotes_full  = (jj git remote list | lines | split column " " name url)
          let remotes_names = ($remotes_full | get name)
          for remote in $remotes {
            if $remote in $remotes_names {
              print $"(ansi purple)[Pusher](ansi rst) Pushing to ($remote)."
              jj git push ...$rest --revisions $revisions --remote $remote
            } else if $remote == "forgejo" {
              print $"(ansi purple)[Pusher](ansi rst) Forgejo remote not found."
              let input = (input --numchar 1 $"(ansi purple)[Pusher](ansi rst) Attempt to add forgejo remote? \(y/n\) ")
              if ($input | str downcase | str starts-with "y") {
                let origin_url = ($remotes_full | where name == "origin" | get url | first)
                let repo_name = ($origin_url | split row "/" | last)
                let forgejo_url = $"https://git.plumj.am/plumjam/($repo_name)"
                print $"(ansi purple)[Pusher](ansi rst) Adding forgejo remote: ($forgejo_url)"
                jj git remote add forgejo $forgejo_url
                print $"(ansi purple)[Pusher](ansi rst) Added forgejo remote, pushing..."
                jj git push ...$rest --revisions $revisions --remote $remote
              } else {
                print $"(ansi purple)[Pusher](ansi rst) Skipping forgejo remote setup."
              }
            } else {
              print $"(ansi purple)[Pusher](ansi rst) Remote ($remote) not available, skipping."
            }
          }
        }
      '';

Replacement in modules/common/jujutsu.nix at line 56 [6.54]

B:BD[9.359] → [9.359:378]

B:BD[9.378] → [4.132:257]

      settings = {
        user.name  = config'.programs.git.settings.user.name;
        user.email = config'.programs.git.settings.user.email;

[9.359]

[8.161]

        settings = {
          user.name  = config'.programs.git.settings.user.name;
          user.email = config'.programs.git.settings.user.email;

Replacement in modules/common/jujutsu.nix at line 60 [6.54]

B:BD[8.162] → [10.3046:3120]

∅:D[10.3120] → [9.522:554]

B:BD[9.522] → [9.522:554]

∅:D[9.554] → [8.445:477]

B:BD[8.445] → [8.445:477]

      signing.key      = "${homeArgs.config.home.homeDirectory}/.ssh/id";
      signing.backend  = "ssh";
      signing.behavior = "own";

[8.162]

[8.477]

          signing.key      = "${homeArgs.config.home.homeDirectory}/.ssh/id";
          signing.backend  = "ssh";
          signing.behavior = "own";

Replacement in modules/common/jujutsu.nix at line 64 [6.54]

B:BD[8.478] → [11.128:339]

B:BD[11.339] → [12.960:1030]

∅:D[13.156] → [8.718:761]

∅:D[12.1030] → [8.718:761]

B:BD[8.718] → [8.718:761]

B:BD[8.761] → [11.340:424]

      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";

[8.478]

[14.29]

          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";

Replacement in modules/common/jujutsu.nix at line 73 [6.54]

B:BD[14.30] → [4.258:302]

      snapshot.max-new-file-size = "10MiB";

[14.30]

[8.761]

          snapshot.max-new-file-size = "10MiB";

Replacement in modules/common/jujutsu.nix at line 75 [6.54]

B:BD[8.762] → [11.425:467]

      lazyjj.highlight-color = "#f2e5bc";

[8.762]

[15.117]

          lazyjj.highlight-color = "#f2e5bc";

Replacement in modules/common/jujutsu.nix at line 77 [6.54]

∅:D[15.118] → [8.762:861]

B:BD[8.762] → [8.762:861]

      git.sign-on-push        = true; # sign in bulk on push
      git.auto-local-bookmark = true;

[15.118]

[8.861]

          git.sign-on-push        = true; # sign in bulk on push
          git.auto-local-bookmark = true;

Replacement in modules/common/jujutsu.nix at line 80 [6.54]

B:BD[8.862] → [11.468:544]

      aliases.".." = [ "edit" "@-" ];
      aliases.",," = [ "edit" "@+" ];

[8.862]

[8.932]

          git.subprocess = true;

Replacement in modules/common/jujutsu.nix at line 82 [6.54]

B:BD[8.933] → [11.545:578]

      aliases.a = [ "abandon" ];

[8.933]

[8.963]

          git.fetch = [ "origin" "forgejo" ];
          git.push  = "origin";

Replacement in modules/common/jujutsu.nix at line 85 [6.54]

B:BD[8.964] → [11.579:661]

      aliases.c  = [ "commit" ];
      aliases.ci = [ "commit" "--interactive" ];

[8.964]

[8.1040]

          aliases.".." = [ "edit" "@-" ];
          aliases.",," = [ "edit" "@+" ];

Replacement in modules/common/jujutsu.nix at line 88 [6.54]
B:BD[8.1041] → [11.662:692]
```
      aliases.e = [ "edit" ];
```
[8.1041]
[8.1068]
```
          aliases.a = [ "abandon" ];
```

Replacement in modules/common/jujutsu.nix at line 90 [6.54]

B:BD[8.1069] → [11.693:775]

      aliases.fetch = [ "git" "fetch" ];
      aliases.f     = [ "git" "fetch" ];

[8.1069]

[8.1145]

          aliases.c  = [ "commit" ];
          aliases.ci = [ "commit" "--interactive" ];

Replacement in modules/common/jujutsu.nix at line 93 [6.54]
B:BD[8.1146] → [11.776:808]
```
      aliases.r = [ "rebase" ];
```
[8.1146]
[8.1175]
```
          aliases.e = [ "edit" ];
```

Replacement in modules/common/jujutsu.nix at line 95 [6.54]

B:BD[8.1176] → [11.809:962]

      aliases.res         = [ "resolve" ];
      aliases.resolve-ast = [ "resolve" "--tool" "mergiraf" ];
      aliases.resa        = [ "resolve-ast" ];

[8.1176]

[8.1320]

          aliases.fetch = [ "git" "fetch" ];
          aliases.f     = [ "git" "fetch" ];

Replacement in modules/common/jujutsu.nix at line 98 [6.54]

B:BD[8.1321] → [11.963:1038]

      aliases.s = [ "split" ];
      aliases.sm = [ "split" "--message" ];

[8.1321]

[16.268]

          aliases.r = [ "rebase" ];

Replacement in modules/common/jujutsu.nix at line 100 [6.54]

B:BD[16.269] → [11.1039:1074]

B:BD[11.1074] → [3.72:116]

∅:D[3.116] → [11.1074:1235]

B:BD[11.1074] → [11.1074:1235]

      aliases.sq   = [ "squash" ];
      aliases.sqf  = [ "squash" "--from" ];
      aliases.sqi  = [ "squash" "--interactive" ];
      aliases.sqm  = [ "squash" "--message" ];
      aliases.sqmi = [ "squash" "--interactive" "--message" ];

[16.269]

[8.1397]

          aliases.res         = [ "resolve" ];
          aliases.resolve-ast = [ "resolve" "--tool" "mergiraf" ];
          aliases.resa        = [ "resolve-ast" ];

Replacement in modules/common/jujutsu.nix at line 104 [6.54]

B:BD[8.1398] → [11.1236:1267]

      aliases.sh = [ "show" ];

[8.1398]

[8.1426]

          aliases.s = [ "split" ];
          aliases.sm = [ "split" "--message" ];

Replacement in modules/common/jujutsu.nix at line 107 [6.54]

B:BD[8.1427] → [11.1268:1394]

      aliases.tug = [ "bookmark" "move" "--from" "closest(@-)" "--to" "closest_pushable(@)" ];
      aliases.t   = [ "tug" ];

[8.1427]

[8.1547]

          aliases.sq   = [ "squash" ];
          aliases.sqf  = [ "squash" "--from" ];
          aliases.sqi  = [ "squash" "--interactive" ];
          aliases.sqm  = [ "squash" "--message" ];
          aliases.sqmi = [ "squash" "--interactive" "--message" ];

Replacement in modules/common/jujutsu.nix at line 113 [6.54]

B:BD[8.1548] → [8.1548:1587]

B:BD[8.1587] → [2.48:87]

      aliases.push = [ "git" "push" ];
      aliases.p    = [ "git" "push" ];

[8.1548]

[8.1626]

          aliases.sh = [ "show" ];

Replacement in modules/common/jujutsu.nix at line 115 [6.54]

B:BD[8.1627] → [8.1627:1680]

B:BD[8.1680] → [11.1395:1448]

      aliases.init  = [ "git" "init" "--colocate" ];
      aliases.i     = [ "git" "init" "--colocate" ];

[8.1627]

[8.1730]

          aliases.tug = [ "bookmark" "move" "--from" "closest(@-)" "--to" "closest_pushable(@)" ];
          aliases.t   = [ "tug" ];

Replacement in modules/common/jujutsu.nix at line 118 [6.54]

B:BD[8.1731] → [8.1731:1785]

B:BD[8.1785] → [11.1449:1503]

      aliases.clone = [ "git" "clone" "--colocate" ];
      aliases.cl    = [ "git" "clone" "--colocate" ];

[8.1731]

[8.1836]

          aliases.push = [ "git" "push" ];
          aliases.p    = [ "git" "push" ];

Replacement in modules/common/jujutsu.nix at line 121 [6.54]

B:BD[8.1837] → [16.454:484]

      aliases.d = [ "diff" ];

[8.1837]

[8.1868]

          aliases.init  = [ "git" "init" "--colocate" ];
          aliases.i     = [ "git" "init" "--colocate" ];

Replacement in modules/common/jujutsu.nix at line 124 [6.54]

B:BD[8.1869] → [8.1869:2096]

B:BD[8.2096] → [11.1504:1564]

B:BD[11.1564] → [5.89:157]

∅:D[5.157] → [11.1632:1702]

B:BD[11.1632] → [11.1632:1702]

      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" ];

[8.1869]

[8.2153]

          aliases.clone = [ "git" "clone" "--colocate" ];
          aliases.cl    = [ "git" "clone" "--colocate" ];
          aliases.d = [ "diff" ];

Replacement in modules/common/jujutsu.nix at line 129 [6.54]

B:BD[8.2154] → [11.1703:1778]

∅:D[11.1778] → [8.2226:2338]

B:BD[8.2226] → [8.2226:2338]

      revset-aliases."closest(to)"          = "heads(::to & bookmarks())";
      revset-aliases."closest_pushable(to)" = "heads(::to & ~description(exact:\"\") & (~empty() | merges()))";

[8.2154]

[8.2338]

          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" ];

Replacement in modules/common/jujutsu.nix at line 139 [6.54]

B:BD[8.2339] → [16.485:581]

      revsets.log = "present(@) | present(trunk()) | ancestors(remote_bookmarks().. | @.., 8)";

[8.2339]

[8.2440]

          revset-aliases."closest(to)"          = "heads(::to & bookmarks())";
          revset-aliases."closest_pushable(to)" = "heads(::to & ~description(exact:\"\") & (~empty() | merges()))";

Replacement in modules/common/jujutsu.nix at line 142 [6.54]

B:BD[8.2441] → [11.1779:1838]

∅:D[11.1838] → [8.2497:2798]

B:BD[8.2497] → [8.2497:2798]

      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(),
          )
        '';

[8.2441]

[8.2798]

          revsets.log = "present(@) | present(trunk()) | ancestors(remote_bookmarks().. | @.., 8)";

Replacement in modules/common/jujutsu.nix at line 144 [6.54]

B:BD[8.2799] → [8.2799:2851]

B:BD[8.2851] → [17.322:369]

∅:D[18.159] → [8.2901:2911]

∅:D[17.369] → [8.2901:2911]

B:BD[8.2901] → [8.2901:2911]

      templates.git_push_bookmark = /* python */ ''
        "change/PlumJam-" ++ change_id.short()
      '';

[8.2799]

[8.2911]

          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(),
            )
          '';

Replacement in modules/common/jujutsu.nix at line 156 [6.54]

B:BD[8.2912] → [9.555:564]

};

[8.2912]

[9.564]

          templates.git_push_bookmark = /* python */ ''
            "change/PlumJam-" ++ change_id.short()
          '';
        };