Skip to content

Commit

Permalink
hosts: remove host modules
Browse files Browse the repository at this point in the history
These are toplevel NixOS config files, and actually shouldn't be further
composed.

Rename them to configuration.nix, and import them directly.

Signed-off-by: Florian Klink <flokli@flokli.de>
  • Loading branch information
flokli authored and henrirosten committed Nov 29, 2023
1 parent fda1e87 commit e5f5d88
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 9 deletions.
File renamed without changes.
File renamed without changes.
13 changes: 4 additions & 9 deletions hosts/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
qemu-common = import ./qemu-common.nix;
common = import ./common.nix;
generic-disk-config = import ./generic-disk-config.nix;
# host modules
host-build01 = import ./build01;
host-ghafhydra = import ./ghafhydra;
host-binarycache = import ./binarycache;
host-monitoring = import ./monitoring;
};

flake.nixosConfigurations = let
Expand All @@ -27,19 +22,19 @@
# Currently not used for anything:
# build01 = lib.nixosSystem {
# inherit specialArgs;
# modules = [self.nixosModules.host-build01];
# modules = [./build01/configuration.nix];
# };
ghafhydra = lib.nixosSystem {
inherit specialArgs;
modules = [self.nixosModules.host-ghafhydra];
modules = [./ghafhydra/configuration.nix];
};
binarycache = lib.nixosSystem {
inherit specialArgs;
modules = [self.nixosModules.host-binarycache];
modules = [./binarycache/configuration.nix];
};
monitoring = lib.nixosSystem {
inherit specialArgs;
modules = [self.nixosModules.host-monitoring];
modules = [./monitoring/configuration.nix];
};
};
}
File renamed without changes.
File renamed without changes.

0 comments on commit e5f5d88

Please sign in to comment.