Clean up module imports for future tests

nixos-modules/default.nix

@@ -1,9 +1,20 @@
-{ private, self, ... }:
+{
+  private,
+  self,
+  disko,
+  sops-nix,
+  ...
+}:
 {
   default =
     { ... }:
     {
 
-      imports = (self.lib.loadSubmodulesFrom ./.) ++ [ private.nixosModules.default ];
+      imports = (self.lib.loadSubmodulesFrom ./.) ++ [
+        ../defaults/meta
+        disko.nixosModules.disko
+        sops-nix.nixosModules.sops
+        private.nixosModules.default
+      ];
     };
 }

nixos-modules/system/default.nix

@@ -11,6 +11,7 @@
     ./overlays.nix
     ./physical.nix
     ./security.nix
+    ./secrets.nix
     ./virtual-machine.nix
   ];
 

nixos-modules/system/secrets.nix

@@ -0,0 +1,11 @@
+{ inputs, ... }:
+{
+  sops.secrets =
+    let
+      allHostsSecretsFile = "${inputs.private}/nixos-configurations/secrets.sops.yaml";
+    in
+    {
+      "msmtp/password".sopsFile = allHostsSecretsFile;
+      "wgautomesh/gossip-secret".sopsFile = allHostsSecretsFile;
+    };
+}