plumjam/nixos - Change XPKDQGFUFF4BT32ODPEJRZGBEOGZVDRAEN2EOWU7DBIN2QQX6KUAC

hosts: better grouping of hosts and splitting of modules

Created by James Plummer on August 31, 2025

XPKDQGFUFF4BT32ODPEJRZGBEOGZVDRAEN2EOWU7DBIN2QQX6KUAC

Dependencies

In channels

main

Change contents

Replacement in lib/system.nix at line 16 [6.508]

B:BD[6.1044] → [6.1044:1180]

  inputModulesLinux  = collectInputs [ "nixosModules"  "default" ];
  inputModulesDarwin = collectInputs [ "darwinModules" "default" ];

[6.1044]

[6.1180]

  inputModulesLinux  = collectInputs [ "nixosModules"  "default" ] ++ [
    inputs.home-manager.nixosModules.home-manager 
    inputs.agenix.nixosModules.default
  ];
  inputModulesDarwin = collectInputs [ "darwinModules" "default" ] ++ [
    inputs.home-manager.darwinModules.home-manager
  ];

Insertion in lib/system.nix at line 31 [6.508]
[6.1405]
[6.1405]
```
    keys = import ../keys.nix;
```

Replacement in lib/system.nix at line 43 [6.508]

B:BD[6.1648] → [6.1648:1703]

        home-manager.sharedModules = inputHomeModules;

[6.1648]

[6.1703]

        home-manager = {
          useGlobalPkgs = true;
          useUserPackages = true;
          sharedModules = inputHomeModules;
          users.james = import ../home/default.nix {
            inherit (config) system;
            lib = self;
            inherit (inputs) fenix nvf bacon-ls fff-nvim agenix;
            pkgs = import inputs.nixpkgs {
              inherit (config) system;
              config.allowUnfree = true;
              config.permittedInsecurePackages = [
                "arc-browser-1.106.0-66192"
              ];
            };
          };
        };

Replacement in lib/default.nix at line 5 [6.2394]

B:BD[6.2594] → [6.2594:2627]

in filesystem // system // values

[6.2594]

in filesystem // system // values // { inherit inputs; }

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

[7.7]

lib: 
let
  inherit (lib) inputs;
in {
  class = "nixos";
  config = lib.nixosSystem' {
    system = "x86_64-linux";
    modules = [
      inputs.disko.nixosModules.disko
      ./configuration.nix
    ];
  };
}

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

[8.169]

lib: 
let
  inherit (lib) inputs;
in {
  class = "nixos";
  config = lib.nixosSystem' {
    system = "x86_64-linux";
    modules = [
      inputs.nixos-wsl.nixosModules.wsl
      ./configuration.nix
    ];
  };
}

Insertion in hosts/pear/configuration.nix at line 5 [9.83451]
[8.1001]
[9.83479]
```
  keys,
```
Deletion in hosts/pear/configuration.nix at line 10 [9.83451]
B:BD[8.1031] → [5.1055:1096]
```
  inherit (import ../../keys.nix) james;
```
Replacement in hosts/pear/configuration.nix at line 80 [9.83451]
B:BD[9.84556] → [5.1097:1142]
```
    openssh.authorizedKeys.keys = [ james ];
```
[9.84556]
[5.1142]
```
    openssh.authorizedKeys.keys = [ keys.james ];
```
Replacement in hosts/pear/configuration.nix at line 84 [9.83451]
B:BD[5.1171] → [5.1171:1216]
```
    openssh.authorizedKeys.keys = [ james ];
```
[5.1171]
[9.84556]
```
    openssh.authorizedKeys.keys = [ keys.james ];
```

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

[4.16]

lib: {
  class = "darwin";
  config = lib.darwinSystem' {
    system = "aarch64-darwin";
    modules = [
      ./configuration.nix
    ];
  };
}

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

[10.2123]

lib: 
let
  inherit (lib) inputs;
in {
  class = "nixos";
  config = lib.nixosSystem' {
    system = "x86_64-linux";
    modules = [
      inputs.disko.nixosModules.disko
      ./configuration.nix
    ];
  };
}

Replacement in home/modules/theme.nix at line 6 [3.13]
B:BD[3.138] → [3.138:157]
```
  is_dark = false;
```
[3.138]
[3.157]
```
  is_dark = true;
```
Replacement in flake.nix at line 64 [9.24075]
∅:D[11.1310] → [6.3273:3313]
∅:D[12.1374] → [6.3273:3313]
∅:D[7.3087] → [6.3273:3313]
B:BD[6.3273] → [6.3273:3313]
```
    inherit (nixpkgs.lib) const extend;
```
[11.1310]
[6.3313]
```
    inherit (builtins) readDir;
    inherit (nixpkgs.lib) attrsToList const extend groupBy listToAttrs mapAttrs nameValuePair;
```

Replacement in flake.nix at line 71 [9.24075]

B:BD[6.3494] → [6.3494:3580]

    systems = {
      linux = "x86_64-linux";
      darwin = "aarch64-darwin";
    };

[6.3494]

[13.473]

    rawHosts = readDir ./hosts
      |> mapAttrs (name: const <| import ./hosts/${name} lib);
    
    hostsByType = rawHosts
      |> attrsToList
      |> groupBy ({ value, ... }:
        if value ? class && value.class == "nixos" then
          "nixosConfigurations"
        else
          "darwinConfigurations")
      |> mapAttrs (const (hosts: 
          hosts 
          |> map ({ name, value }: nameValuePair name value.config)
          |> listToAttrs));

Replacement in flake.nix at line 86 [9.24075]
∅:D[13.474] → [14.4646:4710]
B:BD[14.4646] → [14.4646:4710]
B:BD[14.4710] → [6.3581:3595]
∅:D[6.3595] → [14.4710:4759]
B:BD[14.4710] → [14.4710:4759]
B:BD[14.4759] → [12.1375:1394]
B:BD[12.1394] → [11.1311:1323]
∅:D[11.1323] → [14.4759:4771]
∅:D[12.1394] → [14.4759:4771]
B:BD[14.4759] → [14.4759:4771]
B:BD[14.4771] → [13.475:533]
∅:D[13.533] → [14.4831:4868]
B:BD[14.4831] → [14.4831:4868]
B:BD[14.4868] → [2.83:183]
∅:D[2.183] → [14.4868:4879]
B:BD[14.4868] → [14.4868:4879]
B:BD[14.5099] → [14.5099:5108]
B:BD[14.5108] → [6.3596:3603]
```
      mkHomeConfig = system: {
        inherit
          system
          lib
          fenix
          nvf
          bacon-ls
          fff-nvim
					agenix
          ;
        pkgs = import nixpkgs {
          inherit system;
          config.allowUnfree = true;
          config.permittedInsecurePackages = [
            "arc-browser-1.106.0-66192"
          ];
        };
      };
  in {
```
[13.474]
[6.3603]
```
  in hostsByType // {
```

Deletion in flake.nix at line 89 [9.24075]

B:BD[13.602] → [8.1378:1430]

∅:D[8.1430] → [6.3685:3768]

B:BD[6.3685] → [6.3685:3768]

B:BD[6.3768] → [8.1431:1470]

∅:D[8.1470] → [6.3808:3855]

B:BD[6.3808] → [6.3808:3855]

B:BD[6.3855] → [8.1471:1507]

∅:D[8.1507] → [6.3855:4132]

B:BD[6.3855] → [6.3855:4132]

B:BD[6.4132] → [4.145:197]

∅:D[4.197] → [6.4186:4235]

B:BD[6.4186] → [6.4186:4235]

B:BD[6.4235] → [4.198:237]

∅:D[4.237] → [6.4276:4594]

B:BD[6.4276] → [6.4276:4594]

∅:D[6.4594] → [9.25297:25304]

B:BD[9.25297] → [9.25297:25304]

B:BD[9.25304] → [7.3088:3254]

B:BD[7.3254] → [10.6645:7165]

∅:D[10.7165] → [7.3254:3301]

B:BD[7.3254] → [7.3254:3301]

B:BD[7.3301] → [11.1324:1356]

∅:D[11.1356] → [7.3301:3575]

B:BD[7.3301] → [7.3301:3575]

    nixosConfigurations."pear" = lib.nixosSystem' {
      system = systems.linux;
      modules = [
        nixos-wsl.nixosModules.wsl
        ./hosts/pear/configuration.nix
        home-manager.nixosModules.home-manager
        agenix.nixosModules.default
        (
          { pkgs, ... }:
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.james = import ./home/default.nix (mkHomeConfig systems.linux);
          }
        )
      ];
    };
    darwinConfigurations.lime = lib.darwinSystem' {
      system = systems.darwin;
      modules = [
        ./hosts/lime/configuration.nix
        home-manager.darwinModules.home-manager
        (
          { pkgs, ... }:
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.james = import ./home/default.nix (mkHomeConfig systems.darwin);
          }
        )
      ];
    };
		nixosConfigurations."plum" = lib.nixosSystem' {
      system = systems.linux;
      modules = [
				disko.nixosModules.disko
        ./hosts/plum/configuration.nix
        home-manager.nixosModules.home-manager
				agenix.nixosModules.default
        (
          { pkgs, ... }:
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.james = import ./home/default.nix (mkHomeConfig systems.linux);
          }
        )
      ];
		};
		nixosConfigurations."kiwi" = lib.nixosSystem' {
      system = systems.linux;
      modules = [
				disko.nixosModules.disko
        ./hosts/kiwi/configuration.nix
        home-manager.nixosModules.home-manager
				agenix.nixosModules.default
        (
          { pkgs, ... }:
          {
            home-manager.useGlobalPkgs = true;
            home-manager.useUserPackages = true;
            home-manager.users.james = import ./home/default.nix (mkHomeConfig systems.linux);
          }
        )
      ];
		};

hosts: better grouping of hosts and splitting of modules

Dependencies

In channels

Change contents

Replacement in lib/system.nix at line 16 [6.508]

Insertion in lib/system.nix at line 31 [6.508]

Replacement in lib/system.nix at line 43 [6.508]

Replacement in lib/default.nix at line 5 [6.2394]

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

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

Insertion in hosts/pear/configuration.nix at line 5 [9.83451]

Deletion in hosts/pear/configuration.nix at line 10 [9.83451]

Replacement in hosts/pear/configuration.nix at line 80 [9.83451]

Replacement in hosts/pear/configuration.nix at line 84 [9.83451]

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

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

Replacement in home/modules/theme.nix at line 6 [3.13]

Replacement in flake.nix at line 64 [9.24075]

Replacement in flake.nix at line 71 [9.24075]

Replacement in flake.nix at line 86 [9.24075]

Deletion in flake.nix at line 89 [9.24075]