2024-04-23

3 files changed, 3 insertions, 11 deletions

diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index 94f70ef..1904cdb 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -6,7 +6,7 @@
 }:
 with lib;
 {
-  imports = [ ./hidden.nix ];
+  imports = attrValues (modulesIn ./.);
 
   nixfiles.modules = {
     ark.enable = true;
diff --git a/nixosConfigurations/manwe/default.nix b/nixosConfigurations/manwe/default.nix
index e7edbf9..3707440 100644
--- a/nixosConfigurations/manwe/default.nix
+++ b/nixosConfigurations/manwe/default.nix
@@ -1,11 +1,7 @@
 { config, lib, ... }:
 with lib;
 {
-  imports = [
-    ./mailserver
-    ./webserver.nix
-    ./hidden.nix
-  ];
+  imports = attrValues (modulesIn ./.);
 
   nixfiles.modules = {
     nsd = {
diff --git a/nixosConfigurations/manwe/mailserver/default.nix b/nixosConfigurations/manwe/mailserver/default.nix
index 822de6f..cc8b41d 100644
--- a/nixosConfigurations/manwe/mailserver/default.nix
+++ b/nixosConfigurations/manwe/mailserver/default.nix
@@ -6,7 +6,7 @@
 }:
 with lib;
 {
-  imports = [ inputs.mailserver.nixosModule ];
+  imports = [ inputs.mailserver.nixosModule ] ++ attrValues (modulesIn ./.);
 
   ark.directories = with config.mailserver; [
     "/var/lib/dovecot"
@@ -85,10 +85,6 @@ with lib;
         inherit port;
         password = requirePass;
       };
-
-      # Just a list of accounts with aliases and hasedPasswords. Not necessarily
-      # secret, but kept from prying eyes.
-      loginAccounts = import ./hidden.nix lib;
     };
 
   services = {