From 751694df63b34946e1a79d379eac8c35ba40eed1 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Fri, 16 Sep 2022 15:13:19 +0300
Subject: 2022-09-16

---
 configurations/default.nix | 54 +++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'configurations/default.nix')

diff --git a/configurations/default.nix b/configurations/default.nix
index 124baec..40c133f 100644
--- a/configurations/default.nix
+++ b/configurations/default.nix
@@ -13,11 +13,37 @@ with lib; let
       modules =
         attrValues inputs.self.nixosModules
         ++ modules
-        ++ [(import configuration)];
+        ++ optional (configuration != null) (import configuration);
       specialArgs = {inherit inputs lib this;};
     });
 in
   mapAttrs' mkConfiguration {
+    test-headless = {
+      modules = with inputs; [
+        "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
+        nixpkgs.nixosModules.notDetected
+      ];
+      this = {
+        hostname = "test-headless";
+        system = "x86_64-linux";
+        isHeadless = true;
+        isHeadful = false;
+      };
+    };
+
+    test-headful = {
+      modules = with inputs; [
+        "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
+        nixpkgs.nixosModules.notDetected
+      ];
+      this = {
+        hostname = "test-headful";
+        system = "x86_64-linux";
+        isHeadless = false;
+        isHeadful = true;
+      };
+    };
+
     melian.modules = with inputs; [
       nixos-hardware.nixosModules.common-pc-laptop-ssd
       nixos-hardware.nixosModules.lenovo-thinkpad-t480
@@ -44,30 +70,4 @@ in
       nixos-hardware.nixosModules.common-pc-hdd
       nixpkgs.nixosModules.notDetected
     ];
-
-    test-headless = {
-      modules = with inputs; [
-        "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
-        nixpkgs.nixosModules.notDetected
-      ];
-      this = {
-        hostname = "test-headless";
-        system = "x86_64-linux";
-        isHeadless = true;
-        isHeadful = false;
-      };
-    };
-
-    test-headful = {
-      modules = with inputs; [
-        "${nixpkgs}/nixos/modules/profiles/qemu-guest.nix"
-        nixpkgs.nixosModules.notDetected
-      ];
-      this = {
-        hostname = "test-headful";
-        system = "x86_64-linux";
-        isHeadless = false;
-        isHeadful = true;
-      };
-    };
   }
-- 
cgit 1.4.1