refactor(tests): use submodule instead

tao3k · May 12, 2024 · c233d06 · c233d06
1 parent f4ccf03
commit c233d06
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 446 deletions.
diff --git a/src/mkHome.nix b/src/mkHome.nix
@@ -4,7 +4,13 @@
 # SPDX-License-Identifier: MIT
 
 { lib }:
-userSet: shell: suites:
+homeModule: userSet: shell: suites:
+{
+  homeModule ? [ ],
+  userSet,
+  shell,
+  suites ? [ ],
+}:
 let
   user = lib.head (lib.attrNames userSet);
   pathsToLinkShell = lib.elem shell [
@@ -17,7 +23,8 @@ let
 in
 {
   imports =
-    [
+    lib.flatten [
+      homeModule
       { users.users = userSet; }
       (
         { pkgs, lib, ... }:

diff --git a/src/pops/nixosProfiles.nix b/src/pops/nixosProfiles.nix
@@ -8,12 +8,28 @@
   projectRoot,
   POP,
   flops,
+  lib,
 }:
 (super.nixosModules.addLoadExtender {
   load = {
     src = projectRoot + "/units/nixos/nixosProfiles";
     type = "nixosProfilesOmnibus";
     transformer = [ (_: _: _) ];
+    inputsTransformer = [
+      (
+        self:
+        self
+        // (
+          let
+            system = if self ? system then self.system else throw "system is required";
+          in
+          {
+            isDarwin = lib.elem system lib.systems.doubles.darwin;
+            isLinux = lib.elem system lib.systems.doubles.linux;
+          }
+        )
+      )
+    ];
   };
 }).addExporters
   [

diff --git a/tests/nixos/__fixture/__lock/flake.lock b/tests/nixos/__fixture/__lock/flake.lock
diff --git a/tests/nixos/__fixture/__lock/flake.nix b/tests/nixos/__fixture/__lock/flake.nix
diff --git a/tests/nixos/__fixture/__nixosProfiles/bootstrap.nix b/tests/nixos/__fixture/__nixosProfiles/bootstrap.nix
diff --git a/tests/nixos/__fixture/layouts.nix b/tests/nixos/__fixture/layouts.nix
diff --git a/tests/nixos/__fixture/pops/flake.nix b/tests/nixos/__fixture/pops/flake.nix
diff --git a/tests/nixos/__fixture/pops/homeModules.nix b/tests/nixos/__fixture/pops/homeModules.nix
diff --git a/tests/nixos/__fixture/pops/homeProfiles.nix b/tests/nixos/__fixture/pops/homeProfiles.nix
diff --git a/tests/nixos/__fixture/pops/nixosModules.nix b/tests/nixos/__fixture/pops/nixosModules.nix
diff --git a/tests/nixos/__fixture/pops/nixosProfiles.nix b/tests/nixos/__fixture/pops/nixosProfiles.nix
diff --git a/tests/nixos/__fixture/pops/omnibus.nix b/tests/nixos/__fixture/pops/omnibus.nix