diff options
| author | Quentin Aristote <quentin@aristote.fr> | 2022-11-13 21:55:15 +0100 |
|---|---|---|
| committer | Quentin Aristote <quentin@aristote.fr> | 2022-11-13 21:55:15 +0100 |
| commit | ab779a7476acc3a5b6dc350badd67f72f9402d6e (patch) | |
| tree | 9fb628cf1a019360cb470f45fec55b52e0ae2c64 | |
| parent | 9c49e96889785c4ec1fd1a398f4a8ff4306863fc (diff) | |
remove hardware configuration from test config
| -rw-r--r-- | config/default.nix | 1 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hardware-configuration.nix (renamed from config/hardware-configuration.nix) | 0 | ||||
| -rw-r--r-- | tests/configuration.nix | 4 |
4 files changed, 4 insertions, 3 deletions
diff --git a/config/default.nix b/config/default.nix index 9cb4668..b35ce72 100644 --- a/config/default.nix +++ b/config/default.nix @@ -6,7 +6,6 @@ (modulesPath + "/profiles/minimal.nix") ./boot.nix ./environment.nix - ./hardware-configuration.nix ./networking.nix ./services ./users.nix @@ -9,7 +9,7 @@ hermes = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; - modules = [ ./configuration.nix ]; + modules = [ ./configuration.nix ./hardware-configuration.nix ]; }; hermes-test = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/config/hardware-configuration.nix b/hardware-configuration.nix index 1b79e6f..1b79e6f 100644 --- a/config/hardware-configuration.nix +++ b/hardware-configuration.nix diff --git a/tests/configuration.nix b/tests/configuration.nix index e878c12..73c4bfa 100644 --- a/tests/configuration.nix +++ b/tests/configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, modulesPath, ... }: let nginxPorts = lib.concatLists @@ -15,6 +15,8 @@ let in { imports = [ ../configuration.nix ]; + boot.isContainer = true; + networking = lib.mkForce { domain = "aristote.vm"; |