diff --git a/lib/system.nix b/lib/system.nix index 37ddad5..57e55d1 100644 --- a/lib/system.nix +++ b/lib/system.nix @@ -4,15 +4,19 @@ let lib = nixpkgs.lib; configPath = ./machines/${name}.nix; + machineConfig = + if builtins.pathExists configPath then + configPath + else + ./hardware/base.nix; in lib.nixosSystem { system = "x86_64-linux"; modules = [ ( { config, pkgs, ... }: { - imports = lib.concatLists [ - (lib.optional (builtins.pathExists configPath) configPath) - [] + imports = [ + machineConfig ]; }) ];