plumjam/nixos - Change BBZLZXECSZQF7GI5J2XNDH7LXDB2FELEHUVKAVP4OSIG4RXWVWTAC

{jujutsu,env}: Begin moving modules away from hjem class.

Instead we can use hjem.extraModules inside the nixos/darwin classes.

It's much cleaner and allows us to remove a lot of conditional configs because usually all hjem configs are given to all hosts.

Created by PlumJam on February 5, 2026

BBZLZXECSZQF7GI5J2XNDH7LXDB2FELEHUVKAVP4OSIG4RXWVWTAC

Dependencies

In channels

main

Change contents

Replacement in modules/jujutsu.nix at line 2 [5.140]

B:BD[5.145] → [5.145:181]

  commonModule =
    { pkgs, ... }:

[5.145]

[5.181]

  jujutsuExtra =
    { pkgs, lib, ... }:
    let
      inherit (lib.lists) singleton;
    in

Replacement in modules/jujutsu.nix at line 8 [5.140]

B:BD[5.187] → [5.187:291]

      environment.systemPackages = [
        pkgs.jujutsu
        pkgs.difftastic
        pkgs.mergiraf

[5.187]

[2.110]

      hjem.extraModules = singleton {
        packages = [
          pkgs.jujutsu
          pkgs.difftastic
          pkgs.mergiraf

Replacement in modules/jujutsu.nix at line 14 [5.140]

B:BD[2.111] → [2.111:149]

∅:D[2.149] → [5.291:300]

B:BD[5.291] → [5.291:300]

        pkgs.lazyjj
        pkgs.jjui
      ];

[2.111]

[5.300]

          pkgs.lazyjj
          pkgs.jjui
        ];
      };

Replacement in modules/jujutsu.nix at line 20 [5.140]
B:BD[5.308] → [5.308:313]
B:BD[5.313] → [6.3231:3262]
```
in
{
  flake.modules.hjem.jujutsu =
```
[5.308]
[7.553]
```
  jujutsuBase =
```
Insertion in modules/jujutsu.nix at line 23 [5.140]
[7.571]
[7.571]
```
      lib,
```
Deletion in modules/jujutsu.nix at line 25 [5.140]
B:BD[7.585] → [7.585:598]
```
      theme,
```

Insertion in modules/jujutsu.nix at line 28 [5.140]

[5.386]

      inherit (lib.lists) singleton;
      inherit (config) theme;

Replacement in modules/jujutsu.nix at line 50 [5.140]

B:BD[5.875] → [5.875:939]

        ui.editor = config.environment.sessionVariables.EDITOR;

[5.875]

[7.616]

        ui.editor = config.environment.variables.EDITOR;

Replacement in modules/jujutsu.nix at line 266 [5.140]

B:BD[4.1912] → [4.1912:2099]

      xdg.config.files."jj/config.toml".source = toml.generate "jj-config.toml" jjConfig;
      xdg.config.files."jjui/config.toml".source = toml.generate "jjui-config.toml" jjuiConfig;

[4.1912]

[5.5287]

      hjem.extraModules = singleton {
        xdg.config.files."jj/config.toml".source = toml.generate "jj-config.toml" jjConfig;
        xdg.config.files."jjui/config.toml".source = toml.generate "jjui-config.toml" jjuiConfig;
      };

Replacement in modules/jujutsu.nix at line 271 [5.140]

B:BD[5.5294] → [5.5294:5295]

B:BD[5.5295] → [6.3263:3315]


  flake.modules.nixos.jujutsu-extra = commonModule;

[5.5294]

[5.5354]

in
{
  flake.modules.nixos.jujutsu = jujutsuBase;
  flake.modules.darwin.jujutsu = jujutsuBase;

Replacement in modules/jujutsu.nix at line 276 [5.140]

B:BD[5.5355] → [6.3316:3369]

  flake.modules.darwin.jujutsu-extra = commonModule;

[5.5355]

[5.5415]

  flake.modules.nixos.jujutsu-extra = jujutsuExtra;
  flake.modules.darwin.jujutsu-extra = jujutsuExtra;

Replacement in modules/home.nix at line 37 [8.111]

B:BD[8.288] → [9.9569:9626]

B:BD[9.9626] → [10.383:537]

      hjemModules = attrValues inputs.self.modules.hjem;
      # Perhaps we shouldn't do ^this^ and import the necessary modules per host?
      # This would eliminate the need for a lot of conditional configs.

[9.9568]

[8.722]

      hjemModules = inputs.self.modules.hjem |> attrValues;

Replacement in modules/home.nix at line 63 [8.111]

∅:D[3.7440] → [9.9694:9751]

B:BD[8.1425] → [9.9694:9751]

B:BD[9.9751] → [10.538:692]

      hjemModules = attrValues inputs.self.modules.hjem;
      # Perhaps we shouldn't do ^this^ and import the necessary modules per host?
      # This would eliminate the need for a lot of conditional configs.

[9.9693]

[8.1486]

      hjemModules = inputs.self.modules.hjem |> attrValues;

Replacement in modules/env.nix at line 1 [11.108158]
B:BD[11.108158] → [11.108159:108161]
B:BD[11.108161] → [6.3859:3886]
∅:D[12.228] → [11.108202:108266]
∅:D[6.3886] → [11.108202:108266]
B:BD[11.108202] → [11.108202:108266]
```
{
  flake.modules.hjem.env =
    { pkgs, ... }:
    {
      environment.sessionVariables = {
```
[11.108158]
[12.229]
```
let
  envBase =
    { pkgs, lib, ... }:
    let
      inherit (lib.lists) singleton;
      variables = {
```
Insertion in modules/env.nix at line 13 [11.108158]
[11.108419]
[11.108419]
```
    in
    {
      environment.variables = variables;
```

Replacement in modules/env.nix at line 17 [11.108158]

B:BD[11.108420] → [11.108420:108657]

      # TODO: Add sessionPath equivalent in hjem?
      # home-manager.sharedModules = [{
      #   home.sessionPath = [
      #     "$HOME/.local/bin"
      #     "$HOME/.cargo/bin"
      #     "$HOME/.bun/bin"
      #   ];
      # }];

[11.108420]

[11.108657]

      hjem.extraModules = singleton {
        environment.sessionVariables = variables;
        # TODO: Add sessionPath equivalent in hjem?
        # home-manager.sharedModules = [{
        #   home.sessionPath = [
        #     "$HOME/.local/bin"
        #     "$HOME/.cargo/bin"
        #     "$HOME/.bun/bin"
        #   ];
        # }];
      };

Insertion in modules/env.nix at line 30 [11.108158]

[11.108664]


in
{
  flake.modules.nixos.env = envBase;
  flake.modules.darwin.env = envBase;