Compare commits

..

No commits in common. "94b7310dc764b8ae4bb0e30a3d7b8e6f07f83344" and "3f4084fa3038db4c707d111503c95e3bab78b128" have entirely different histories.

8 changed files with 38 additions and 53 deletions

View File

@ -15,17 +15,34 @@
outputs = inputs @ { self, nixpkgs, home-manager, jovian-nixos, agenix, nixos-wsl, ... }: outputs = inputs @ { self, nixpkgs, home-manager, jovian-nixos, agenix, nixos-wsl, ... }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
hosts = builtins.fromJSON (builtins.readFile ./hosts.json); user = "tstarr";
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in {
nixosConfigurations = lib.mapAttrs (hostname: hostConfig: nixosConfigurations = {
lib.nixosSystem (import ./hosts/${hostname} { kestrel = lib.nixosSystem (import ./hosts/kestrel {
inherit lib; inherit lib;
inherit system inputs agenix home-manager jovian-nixos nixos-wsl; inherit system user inputs agenix home-manager;
specialArgs = { });
user = hostConfig.user; shivan = lib.nixosSystem (import ./hosts/shivan {
}; inherit lib;
}) inherit system user inputs agenix home-manager;
) hosts; });
torus = lib.nixosSystem (import ./hosts/torus {
inherit lib;
inherit system user inputs agenix home-manager;
});
bulwark = lib.nixosSystem (import ./hosts/bulwark {
inherit lib;
inherit system user inputs agenix home-manager jovian-nixos;
});
wsl = lib.nixosSystem (import ./hosts/wsl {
inherit lib;
inherit system user inputs agenix home-manager nixos-wsl;
});
osprey = lib.nixosSystem (import ./hosts/osprey {
inherit lib;
inherit system user inputs agenix home-manager;
});
};
}; };
} }

View File

@ -1,20 +0,0 @@
{
"kestrel": {
"user": "tstarr"
},
"shivan": {
"user": "tstarr"
},
"torus": {
"user": "tstarr"
},
"bulwark": {
"user": "tstarr"
},
"osprey": {
"user": "tstarr"
},
"wsl": {
"user": "user"
}
}

View File

@ -1,7 +1,5 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, jovian-nixos, ... }: { lib, system, user, inputs, agenix, home-manager, jovian-nixos, ... }:
let {
user = specialArgs.user;
in {
inherit system; inherit system;
specialArgs = { inherit user inputs home-manager jovian-nixos; }; specialArgs = { inherit user inputs home-manager jovian-nixos; };
modules = [ modules = [

View File

@ -1,7 +1,5 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }: { lib, system, user, inputs, agenix, home-manager, ... }:
let {
user = specialArgs.user;
in {
inherit system; inherit system;
specialArgs = { inherit user inputs home-manager; }; specialArgs = { inherit user inputs home-manager; };
modules = [ modules = [

View File

@ -1,7 +1,5 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }: { lib, system, user, inputs, agenix, home-manager, ... }:
let {
user = specialArgs.user;
in {
inherit system; inherit system;
specialArgs = { inherit user inputs home-manager; }; specialArgs = { inherit user inputs home-manager; };
modules = [ modules = [

View File

@ -1,7 +1,5 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }: { lib, system, user, inputs, agenix, home-manager, ... }:
let {
user = specialArgs.user;
in {
inherit system; inherit system;
specialArgs = { inherit user inputs home-manager; }; specialArgs = { inherit user inputs home-manager; };
modules = [ modules = [

View File

@ -1,7 +1,5 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, ... }: { lib, system, user, inputs, agenix, home-manager, ... }:
let {
user = specialArgs.user;
in {
inherit system; inherit system;
specialArgs = { inherit user inputs home-manager; }; specialArgs = { inherit user inputs home-manager; };
modules = [ modules = [

View File

@ -1,7 +1,5 @@
{ lib, specialArgs, system, inputs, agenix, home-manager, nixos-wsl, ... }: { lib, system, user, inputs, agenix, home-manager, nixos-wsl, ... }:
let {
user = specialArgs.user;
in {
inherit system; inherit system;
specialArgs = { inherit user inputs nixos-wsl home-manager; }; specialArgs = { inherit user inputs nixos-wsl home-manager; };
modules = [ modules = [