Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2018-09-18 22:41:16 +02:00
commit a49930ff4d
2 changed files with 7 additions and 1 deletions

View File

@ -53,7 +53,7 @@ in {
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
system.activationScripts.announce-activation = '' system.activationScripts.announce-activation = stringAfter [ "etc" ] ''
${announce-activation} ${announce-activation}
''; '';
}; };

View File

@ -182,6 +182,11 @@ let
to = concatMapStringsSep "," (getAttr "mail") (toList to); to = concatMapStringsSep "," (getAttr "mail") (toList to);
}; };
in mapAttrsToList format (with config.krebs.users; let in mapAttrsToList format (with config.krebs.users; let
brain-ml = [
lass
makefu
tv
];
eloop-ml = spam-ml ++ [ ciko ]; eloop-ml = spam-ml ++ [ ciko ];
spam-ml = [ spam-ml = [
lass lass
@ -191,6 +196,7 @@ let
ciko.mail = "ciko@slash16.net"; ciko.mail = "ciko@slash16.net";
in { in {
"anmeldung@eloop.org" = eloop-ml; "anmeldung@eloop.org" = eloop-ml;
"brain@krebsco.de" = brain-ml;
"cfp@eloop.org" = eloop-ml; "cfp@eloop.org" = eloop-ml;
"kontakt@eloop.org" = eloop-ml; "kontakt@eloop.org" = eloop-ml;
"root@eloop.org" = eloop-ml; "root@eloop.org" = eloop-ml;