plumjam/nixos - Change TTZMDTJO3H6M2ZPFNW6HYXGFVM7YSBA4NKWQCXDNLVZK4QAXNFWQC

git: Use new home-manager config structure.

Fixes evaluation warnings for deprecated settings.

Created by PlumJam on October 22, 2025

TTZMDTJO3H6M2ZPFNW6HYXGFVM7YSBA4NKWQCXDNLVZK4QAXNFWQC

Dependencies

In channels

main

Change contents

Replacement in modules/common/jujutsu.nix at line 13 [6.54]
B:BD[5.115] → [5.115:156]
```
      programs.git.difftastic = enabled;
```
[5.115]
[5.156]
```
      programs.difftastic = enabled;
```

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

B:BD[5.378] → [5.378:483]

        user.name  = config'.programs.git.userName;
        user.email = config'.programs.git.userEmail;

[5.378]

[7.161]

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

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

B:BD[2.30] → [2.30:73]

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

[2.30]

[7.761]

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

Insertion in modules/common/git.nix at line 25 [9.19673]
[8.3530]
[4.3249]
```
      programs.difftastic = enabled;
```
Insertion in modules/common/git.nix at line 28 [9.19673]
[4.3255]
[4.3255]
Deletion in modules/common/git.nix at line 31 [9.19673]
B:BD[10.996] → [10.996:1063]
```
        userName  = "PlumJam";
        userEmail = "git@plumj.am";
```

Replacement in modules/common/git.nix at line 37 [9.19673]

B:BD[11.3234] → [10.1172:1202]

        difftastic = enabled;

[11.3234]

[9.19895]

        settings = {
          user.name  = "PlumJam";
          user.email = "git@plumj.am";

Deletion in modules/common/git.nix at line 41 [9.19673]
B:BD[9.19896] → [10.1203:1227]
```
        extraConfig = {
```
Replacement in modules/common/git.nix at line 84 [9.19673]
∅:D[3.129] → [10.2541:2552]
B:BD[10.2541] → [10.2541:2552]
```
        };
```
[3.129]
[9.20655]
```
          aliases = {
            diff-stat = "diff --stat --ignore-space-change -r";
```

Replacement in modules/common/git.nix at line 87 [9.19673]

B:BD[9.20656] → [10.2553:2635]

        aliases = {
          diff-stat = "diff --stat --ignore-space-change -r";

[9.20656]

[5.686]

            f = "pull";
            p = "push";

Replacement in modules/common/git.nix at line 90 [9.19673]
B:BD[5.687] → [10.2636:2680]
∅:D[12.74] → [9.20759:20760]
∅:D[10.2680] → [9.20759:20760]
B:BD[9.20759] → [9.20759:20760]
B:BD[9.20760] → [10.2681:2742]
```
          f = "pull";
          p = "push";
          cm = "commit -m";
          ca = "commit --amend";
```
[5.687]
[9.20821]
```
            cm = "commit -m";
            ca = "commit --amend";
```

Replacement in modules/common/git.nix at line 93 [9.19673]

B:BD[9.20822] → [10.2743:2792]

          aa = "add .";
          ap = "add -p";

[9.20822]

[13.1017]

            aa = "add .";
            ap = "add -p";

Replacement in modules/common/git.nix at line 96 [9.19673]

B:BD[13.1018] → [10.2793:2941]

          lg = "log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";

[13.1018]

[13.1019]

            lg = "log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";

Replacement in modules/common/git.nix at line 98 [9.19673]

B:BD[13.1020] → [10.2942:2997]

          st  = "status -s";
          sta = "status";

[13.1020]

[13.1021]

            st  = "status -s";
            sta = "status";

Replacement in modules/common/git.nix at line 101 [9.19673]
B:BD[13.1022] → [10.2998:3023]
```
          sw = "switch";
```
[13.1022]
[13.1070]
```
            sw = "switch";
```
Replacement in modules/common/git.nix at line 103 [9.19673]
B:BD[13.1071] → [10.3024:3059]
```
          oneln = "log --oneline";
```
[13.1071]
[13.1072]
```
            oneln = "log --oneline";
```

Replacement in modules/common/git.nix at line 105 [9.19673]

B:BD[13.1073] → [10.3060:3124]

          sus = "!f() { git branch --set-upstream-to $1; }; f";

[13.1073]

[10.3124]

            sus = "!f() { git branch --set-upstream-to $1; }; f";

Replacement in modules/common/git.nix at line 107 [9.19673]

B:BD[10.3125] → [10.3125:3407]

          a = ''
            !f() { \
              for pattern in "$@"; do \
                matches=$(git ls-files | grep -i "$pattern"); \
                if [ -z "$matches" ]; then \
                  echo "no files found matching \"$pattern\""; \
                  continue; \

[10.3125]

[10.3407]

            a = /* bash */ ''
              !f() { \
                for pattern in "$@"; do \
                  matches=$(git ls-files | grep -i "$pattern"); \
                  if [ -z "$matches" ]; then \
                    echo "no files found matching \"$pattern\""; \
                    continue; \
                  fi; \
                  if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                    git add "$matches"; \
                    echo "added: $matches"; \
                  else \
                    echo "multiple matches for \"$pattern\":"; \
                    echo "$matches"; \
                    echo "$matches" | xargs git add; \
                    echo "added all matches"; \
                  fi; \
                done; \
              }; f'';
            r = /* bash */ ''
              !f() { \
                if [ $# -eq 0 ]; then \
                  git restore .; \
                  echo "restored all files"; \
                  return; \

Replacement in modules/common/git.nix at line 133 [9.19673]

B:BD[10.3429] → [10.3429:3799]

                if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                  git add "$matches"; \
                  echo "added: $matches"; \
                else \
                  echo "multiple matches for \"$pattern\":"; \
                  echo "$matches"; \
                  echo "$matches" | xargs git add; \
                  echo "added all matches"; \

[10.3429]

[10.3799]

                for pattern in "$@"; do \
                  matches=$(git ls-files | grep -i "$pattern"); \
                  if [ -z "$matches" ]; then \
                    echo "no files found matching \"$pattern\""; \
                    continue; \
                  fi; \
                  if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                    git restore "$matches"; \
                    echo "restored: $matches"; \
                  else \
                    echo "multiple matches for \"$pattern\":"; \
                    echo "$matches"; \
                    printf "restore all? (y/n): "; \
                    read response; \
                    if echo "$response" | grep -q "^[Yy]"; then \
                      echo "$matches" | xargs git restore; \
                      echo "restored all matches"; \
                    fi; \
                  fi; \
                done; \
              }; f'';
            rs = /* bash */ ''
              !f() { \
                if [ $# -eq 0 ]; then \
                  git restore --staged .; \
                  echo "unstaged all files"; \
                  return; \

Replacement in modules/common/git.nix at line 161 [9.19673]

B:BD[10.3821] → [10.3821:3843]

∅:D[10.3843] → [14.107:127]

B:BD[14.107] → [14.107:127]

B:BD[14.127] → [10.3844:4288]

              done; \
            }; f'';
          r = ''
            !f() { \
              if [ $# -eq 0 ]; then \
                git restore .; \
                echo "restored all files"; \
                return; \
              fi; \
              for pattern in "$@"; do \
                matches=$(git ls-files | grep -i "$pattern"); \
                if [ -z "$matches" ]; then \
                  echo "no files found matching \"$pattern\""; \
                  continue; \

[10.3821]

[10.4288]

                for pattern in "$@"; do \
                  matches=$(git ls-files | grep -i "$pattern"); \
                  if [ -z "$matches" ]; then \
                    echo "no files found matching \"$pattern\""; \
                    continue; \
                  fi; \
                  if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                    git restore --staged "$matches"; \
                    echo "unstaged: $matches"; \
                  else \
                    echo "multiple matches for \"$pattern\":"; \
                    echo "$matches"; \
                    printf "unstage all? (y/n): "; \
                    read response; \
                    if echo "$response" | grep -q "^[Yy]"; then \
                      echo "$matches" | xargs git restore --staged; \
                      echo "unstaged all matches"; \
                    fi; \
                  fi; \
                done; \
              }; f'';
            d = /* bash */ ''
              !f() { \
                if [ $# -eq 0 ]; then \
                  git diff; \
                  return; \

Replacement in modules/common/git.nix at line 188 [9.19673]

B:BD[10.4310] → [10.4310:4848]

                if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                  git restore "$matches"; \
                  echo "restored: $matches"; \
                else \
                  echo "multiple matches for \"$pattern\":"; \
                  echo "$matches"; \
                  printf "restore all? (y/n): "; \
                  read response; \
                  if echo "$response" | grep -q "^[Yy]"; then \
                    echo "$matches" | xargs git restore; \
                    echo "restored all matches"; \

[10.4310]

[10.4848]

                for pattern in "$@"; do \
                  matches=$(git ls-files | grep -i "$pattern"); \
                  if [ -z "$matches" ]; then \
                    echo "no files found matching \"$pattern\""; \
                    continue; \
                  fi; \
                  if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                    git diff "$matches"; \
                  else \
                    echo "multiple matches for \"$pattern\":"; \
                    echo "$matches"; \
                    echo "$matches" | xargs git diff; \

Insertion in modules/common/git.nix at line 201 [9.19673]

[10.4872]

[14.313]

                done; \
              }; f'';
            ds = /* bash */ ''
              !f() { \
                if [ $# -eq 0 ]; then \
                  git diff --staged; \
                  return; \

Replacement in modules/common/git.nix at line 209 [9.19673]

B:BD[14.335] → [10.4873:4895]

∅:D[10.4895] → [14.1311:1331]

B:BD[14.1311] → [14.1311:1331]

B:BD[14.1331] → [10.4896:5928]

              done; \
            }; f'';
          rs = ''
            !f() { \
              if [ $# -eq 0 ]; then \
                git restore --staged .; \
                echo "unstaged all files"; \
                return; \
              fi; \
              for pattern in "$@"; do \
                matches=$(git ls-files | grep -i "$pattern"); \
                if [ -z "$matches" ]; then \
                  echo "no files found matching \"$pattern\""; \
                  continue; \
                fi; \
                if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                  git restore --staged "$matches"; \
                  echo "unstaged: $matches"; \
                else \
                  echo "multiple matches for \"$pattern\":"; \
                  echo "$matches"; \
                  printf "unstage all? (y/n): "; \
                  read response; \
                  if echo "$response" | grep -q "^[Yy]"; then \
                    echo "$matches" | xargs git restore --staged; \
                    echo "unstaged all matches"; \

[14.335]

[10.5928]

                for pattern in "$@"; do \
                  matches=$(git ls-files | grep -i "$pattern"); \
                  if [ -z "$matches" ]; then \
                    echo "no files found matching \"$pattern\""; \
                    continue; \
                  fi; \
                  if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                    git diff --staged "$matches"; \
                  else \
                    echo "multiple matches for \"$pattern\":"; \
                    echo "$matches"; \
                    echo "$matches" | xargs git diff --staged; \

Replacement in modules/common/git.nix at line 222 [9.19673]

∅:D[10.5952] → [14.1527:1549]

B:BD[14.1527] → [14.1527:1549]

B:BD[14.1549] → [10.5953:5975]

∅:D[10.5975] → [14.2543:2563]

B:BD[14.2543] → [14.2543:2563]

B:BD[14.2563] → [10.5976:6674]

∅:D[10.6674] → [14.2695:2717]

B:BD[14.2695] → [14.2695:2717]

B:BD[14.2717] → [10.6675:6697]

∅:D[10.6697] → [15.1087:1107]

B:BD[15.1087] → [15.1087:1107]

B:BD[15.1107] → [10.6698:7102]

∅:D[10.7102] → [14.3635:3657]

B:BD[14.3635] → [14.3635:3657]

B:BD[14.3657] → [10.7103:7447]

∅:D[10.7447] → [14.4537:4557]

B:BD[14.4537] → [14.4537:4557]

                fi; \
              done; \
            }; f'';
          d = ''
            !f() { \
              if [ $# -eq 0 ]; then \
                git diff; \
                return; \
              fi; \
              for pattern in "$@"; do \
                matches=$(git ls-files | grep -i "$pattern"); \
                if [ -z "$matches" ]; then \
                  echo "no files found matching \"$pattern\""; \
                  continue; \
                fi; \
                if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                  git diff "$matches"; \
                else \
                  echo "multiple matches for \"$pattern\":"; \
                  echo "$matches"; \
                  echo "$matches" | xargs git diff; \
                fi; \
              done; \
            }; f'';
          ds = ''
            !f() { \
              if [ $# -eq 0 ]; then \
                git diff --staged; \
                return; \
              fi; \
              for pattern in "$@"; do \
                matches=$(git ls-files | grep -i "$pattern"); \
                if [ -z "$matches" ]; then \
                  echo "no files found matching \"$pattern\""; \
                  continue; \
                fi; \
                if [ $(echo "$matches" | wc -l) -eq 1 ]; then \
                  git diff --staged "$matches"; \
                else \
                  echo "multiple matches for \"$pattern\":"; \
                  echo "$matches"; \
                  echo "$matches" | xargs git diff --staged; \
                fi; \
              done; \
            }; f'';

[10.5952]

[10.7448]

                done; \
              }; f'';
          };

git: Use new home-manager config structure.

Dependencies

In channels

Change contents

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

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

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

Insertion in modules/common/git.nix at line 25 [9.19673]

Insertion in modules/common/git.nix at line 28 [9.19673]

Deletion in modules/common/git.nix at line 31 [9.19673]