plumjam/nixos - Change SBIL66XUEAYRITCGPQUNJUUVUWOFPDD4Q3F2POQRBNMS6GDUZAPQC

hosts: users back to hosts + setup distributed builds

Created by James Plummer on September 12, 2025

SBIL66XUEAYRITCGPQUNJUUVUWOFPDD4Q3F2POQRBNMS6GDUZAPQC

Dependencies

In channels

main

Change contents

File deletion: shared.nix

BF:BFD[3.2] → [2.1101:1135]

BF:BFD[2.1135] → [2.458:458]

B:BD[2.458] → [2.459:1100]

{ self, config, inputs, lib, pkgs, keys, ... }: let
  inherit (lib) enabled mkIf optionalAttrs;
in {
  # Common user configuration
  users.users.james = {
    shell = pkgs.nushell;
  } // optionalAttrs config.isLinux {
    isNormalUser = true;
    extraGroups  = [ "wheel" ];
    openssh.authorizedKeys.keys = [ keys.james ];
  } // optionalAttrs config.isDarwin {
    name = "james";
    home = "/Users/james";
  };
  # Home Manager common config (Linux only)
  home-manager = mkIf config.isLinux {
    users.james = {};
    sharedModules = [{
      home.stateVersion     = "24.11";
      programs.home-manager = enabled;
    }];
  };
}

Replacement in modules/nix.nix at line 7 [2.1137]

B:BD[2.1428] → [2.1428:1998]

  # will do later
  # nix.distributedBuilds = true;
  # nix.buildMachines = self.nixosConfigurations
  #   |> attrsToList
  #   |> filter ({ name, value }:
  #     name != (config.networking.hostName or config.networking.computerName or "") &&
  #     value.config.users.users ? build)
  #   |> map ({ name, value }: {
  #     hostName = name;
  #     maxJobs = 20;
  #     protocol = "ssh-ng";
  #     sshUser = "build";
  #     supportedFeatures = [ "benchmark" "big-parallel" "kvm" "nixos-test" ];
  #     system = value.config.nixpkgs.hostPlatform.system;
  #   });

[2.1428]

[2.1998]

  nix.distributedBuilds = true;
  nix.buildMachines = self.nixosConfigurations
    |> attrsToList
    |> filter ({ name, value }:
      name != (config.networking.hostName or config.networking.computerName or "") &&
      value.config.users.users ? build)
    |> map ({ name, value }: {
      hostName = name;
      maxJobs = 20;
      protocol = "ssh-ng";
      sshUser = "build";
      supportedFeatures = [ "benchmark" "big-parallel" "kvm" "nixos-test" ];
      system = value.config.nixpkgs.hostPlatform.system;
    });

Deletion in hosts/plum/default.nix at line 29 [4.987]
B:BD[2.3576] → [2.3576:3615]
```
          (self + /modules/shared.nix)
```

Replacement in hosts/plum/default.nix at line 65 [4.987]

B:BD[2.4557] → [2.4557:4638]

        users.users.james.hashedPasswordFile = config.age.secrets.password.path;

[2.4557]

[2.4638]

        users.users.james = {
          isNormalUser       = true;
          shell              = pkgs.nushell;
          hashedPasswordFile = config.age.secrets.password.path;
          extraGroups        = [ "wheel" ];
          openssh.authorizedKeys.keys = [ keys.james ];
        };

Insertion in hosts/plum/default.nix at line 78 [4.987]

[2.4810]

        users.groups.build = {};
        users.users.build = {
          description                 = "Build";
          openssh.authorizedKeys.keys = [ keys.james ];
          hashedPasswordFile          = config.age.secrets.password.path;
          isNormalUser                = true;
          extraGroups                 = [ "build" ];
        };

Deletion in hosts/pear/default.nix at line 15 [4.1239]
B:BD[2.5711] → [2.5711:5750]
```
          (self + /modules/shared.nix)
```

Replacement in hosts/pear/default.nix at line 73 [4.1239]

B:BD[2.7456] → [2.7456:7520]

        users.users.james.extraGroups = [ "docker" "dialout" ];

[2.7456]

[2.7520]

        users.users.james = {
          isNormalUser = true;
          shell        = pkgs.nushell;
          extraGroups  = [ "wheel" "docker" "dialout" ];
          openssh.authorizedKeys.keys = [ keys.james ];
        };

Insertion in hosts/pear/default.nix at line 82 [4.1239]

[2.7593]

        users.groups.build = {};
        users.users.build = {
          description                 = "Build";
          openssh.authorizedKeys.keys = [ keys.james ];
          isNormalUser                = true;
          extraGroups                 = [ "build" ];
        };

Deletion in hosts/lime/default.nix at line 13 [4.1603]
B:BD[2.8396] → [2.8396:8435]
```
          (self + /modules/shared.nix)
```
Deletion in hosts/kiwi/default.nix at line 23 [4.1791]
B:BD[2.11317] → [2.11317:11356]
```
          (self + /modules/shared.nix)
```

Replacement in hosts/kiwi/default.nix at line 59 [4.1791]

B:BD[2.12298] → [2.12298:12379]

        users.users.james.hashedPasswordFile = config.age.secrets.password.path;

[2.12298]

[2.12379]

        users.users.james = {
          isNormalUser       = true;
          shell              = pkgs.nushell;
          hashedPasswordFile = config.age.secrets.password.path;
          extraGroups        = [ "wheel" ];
          openssh.authorizedKeys.keys = [ keys.james ];
        };

Insertion in hosts/kiwi/default.nix at line 72 [4.1791]

[2.12551]

        users.groups.build = {};
        users.users.build = {
          description                 = "Build";
          openssh.authorizedKeys.keys = [ keys.james ];
          hashedPasswordFile          = config.age.secrets.password.path;
          isNormalUser                = true;
          extraGroups                 = [ "build" ];
        };