hd/cfg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

further improvements

Browse source
This commit is contained in:
Henri Dohmen 2026-04-04 15:08:45 +02:00
parent 1ea5aeab92
commit a25e7a64ff
1 changed files with 33 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

81
flake.nix
View file

@ -76,32 +76,27 @@
++ (if isServer then [ ] else [ ./home ]);
};
# Not exposed as flake outputs because they depend on specialArgs
# if you add a host, make sure to add it to var/default.nix as well
nixosModules = {
"solo" = mkModule { entry = ./host/solo; };
"c2" = mkModule { entry = ./host/c2; };
"fw" = mkModule { entry = ./host/fw; };
"roam" = mkModule {
entry = ./host/roam;
isServer = true;
};
};
nixosModules =
lib.genAttrs var.desktops (host: mkModule { entry = ./host/${host}; })
// lib.genAttrs var.servers (
host:
mkModule {
entry = ./host/${host};
isServer = true;
}
);
in
{
nixosConfigurations =
let
mkDesktop = host: {
name = host;
value = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit specialArgs;
modules = [ (nixosModules.${host}) ];
};
};
in
lib.listToAttrs (map mkDesktop var.desktops)
lib.genAttrs var.desktops (
host:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
inherit specialArgs;
modules = [ nixosModules.${host} ];
}
)
// {
"test-vm" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
@ -117,36 +112,26 @@
};
};
colmenaHive = colmena.lib.makeHive {
meta = {
nixpkgs = import nixpkgs {
system = "x86_64-linux";
colmenaHive = colmena.lib.makeHive (
{
meta = {
nixpkgs = import nixpkgs { system = "x86_64-linux"; };
inherit specialArgs;
};
inherit specialArgs;
};
"roam" = {
deployment = {
targetHost = "185.163.117.158";
buildOnTarget = true;
"roam" = {
deployment = {
targetHost = "185.163.117.158";
buildOnTarget = true;
};
imports = [ nixosModules."roam" ];
};
imports = [ nixosModules."roam" ];
};
"solo" = {
}
// lib.genAttrs var.desktops (host: {
deployment.targetHost = null;
deployment.allowLocalDeployment = true;
imports = [ nixosModules."solo" ];
};
"c2" = {
deployment.targetHost = null;
deployment.allowLocalDeployment = true;
imports = [ nixosModules."c2" ];
};
"fw" = {
deployment.targetHost = null;
deployment.allowLocalDeployment = true;
imports = [ nixosModules."fw" ];
};
};
imports = [ nixosModules.${host} ];
})
);
}
// flake-utils.lib.eachDefaultSystem (
system: