Start all secrets on boot

lib/fudo/mail/postfix.nix

@@ -15,8 +15,8 @@ let
 
   make-user-aliases = entries:
     concatStringsSep "\n" (mapAttrsToList (user: aliases:
-      concatStringsSep "\n"
+      concatStringsSep "\n" (map (alias: "${alias}  ${user}") aliases))
-      (map (alias: "${alias}  ${user}@${cfg.domain}") aliases)) entries);
+      entries);
 
   make-alias-users = domains: entries:
     concatStringsSep "\n" (flatten (mapAttrsToList (alias: users:

lib/fudo/mail/rspamd.nix

@@ -1,8 +1,7 @@
 { config, pkgs, lib, ... }:
 
 with lib;
-let
+let cfg = config.fudo.mail-server;
-  cfg = config.fudo.mail-server;
 
 in {
   config = mkIf cfg.enable {
@@ -73,7 +72,7 @@ in {
             mode = "0666";
           }
         ];
-        includes = [];
+        includes = [ ];
       };
     };
 
@@ -87,6 +86,7 @@ in {
       requires = [ "rspamd.service" ];
     };
 
-    users.extraUsers.${config.services.postfix.user}.extraGroups = [ config.services.rspamd.group ];
+    users.extraUsers.${config.services.postfix.user}.extraGroups =
+      [ config.services.rspamd.group ];
   };
 }

lib/fudo/secrets.nix

@@ -39,8 +39,8 @@ let
     { source-file, target-file, user, group, permissions, ... }: {
       description =
         "decrypt secret ${secret-name} at ${target-host}:${target-file}.";
-      wantedBy = [ cfg.secret-target ];
+      wantedBy = [ cfg.secret-target "multi-user.target" ];
-      before = [ cfg.secret-target ];
+      before = [ cfg.secret-target "multi-user.target" ];
       serviceConfig = {
         Type = "simple";
         RemainAfterExit = true;