refactor flake to allow for alternate users

This commit is contained in:
Tyler Starr 2024-12-19 11:03:57 -08:00
parent 3f4084fa30
commit 26301235fe
8 changed files with 53 additions and 38 deletions

View File

@ -15,34 +15,17 @@
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";
user = "tstarr"; hosts = builtins.fromJSON (builtins.readFile ./hosts.json);
lib = nixpkgs.lib; lib = nixpkgs.lib;
in { in {
nixosConfigurations = { nixosConfigurations = lib.mapAttrs (hostname: hostConfig:
kestrel = lib.nixosSystem (import ./hosts/kestrel { lib.nixosSystem (import ./hosts/${hostname} {
inherit lib; inherit lib;
inherit system user inputs agenix home-manager; inherit system inputs agenix home-manager jovian-nixos nixos-wsl;
}); specialArgs = {
shivan = lib.nixosSystem (import ./hosts/shivan { user = hostConfig.user;
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;
});
};
}; };
} }

20
provision/hosts.json Normal file
View File

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

View File

@ -1,5 +1,7 @@
{ lib, system, user, inputs, agenix, home-manager, jovian-nixos, ... }: { lib, specialArgs, system, 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,5 +1,7 @@
{ lib, system, user, inputs, agenix, home-manager, ... }: { lib, specialArgs, system, 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,5 +1,7 @@
{ lib, system, user, inputs, agenix, home-manager, ... }: { lib, specialArgs, system, 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,5 +1,7 @@
{ lib, system, user, inputs, agenix, home-manager, ... }: { lib, specialArgs, system, 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,5 +1,7 @@
{ lib, system, user, inputs, agenix, home-manager, ... }: { lib, specialArgs, system, 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,5 +1,7 @@
{ lib, system, user, inputs, agenix, home-manager, nixos-wsl, ... }: { lib, specialArgs, system, 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 = [