diff --git a/nixos/machines/ghatanothoa/configuration.nix b/nixos/machines/ghatanothoa/configuration.nix index 207e37f..3b4faa5 100644 --- a/nixos/machines/ghatanothoa/configuration.nix +++ b/nixos/machines/ghatanothoa/configuration.nix @@ -3,7 +3,6 @@ ./hardware-configuration.nix ../../modules/jitsi.nix ../../roles - ../../roles/vm.nix ./network.nix ]; diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix index 2936ac3..f015cb8 100644 --- a/nixos/roles/default.nix +++ b/nixos/roles/default.nix @@ -1,15 +1,21 @@ { pkgs, lib, + vm ? true, ... }: { - imports = [ - ./admins.nix - ./nix_keys.nix - ./prometheusNodeExporter.nix - ../modules/impermanence.nix - ]; - + imports = + [ + ./admins.nix + ./nix_keys.nix + ./prometheusNodeExporter.nix + ../modules/impermanence.nix + ] + ++ ( + if vm + then [./vm.nix] + else [./hardware.nix] + ); nix = { extraOptions = '' experimental-features = nix-command flakes