From cb4c54ce38050cd36d87e4a2907bfe5cc1930c39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Yule=20B=C3=A4dorf?= Date: Thu, 28 Mar 2024 17:18:18 +0100 Subject: [PATCH] email: badly obfuscate addresses --- lib/default.nix | 1 + ...r.signature => admins_pub.solar.signature} | 0 ...e.baedorf_ext.ehealthexperts.de.signature} | 0 ...benjamin.baedorf_rwth-aachen.de.signature} | 0 ...amin.yule.baedorf_verkstedt.com.signature} | 0 ...ace.signature => byb_miom.space.signature} | 0 ...lar.signature => crew_pub.solar.signature} | 0 ...ure => hello_benjaminbaedorf.eu.signature} | 0 ...2f.io.signature => mail_b12f.io.signature} | 0 users/b12f/email.nix | 35 ++++++++++--------- 10 files changed, 19 insertions(+), 17 deletions(-) rename users/b12f/.config/neomutt/{admins@pub.solar.signature => admins_pub.solar.signature} (100%) rename users/b12f/.config/neomutt/{benjamin-yule.baedorf@ext.ehealthexperts.de.signature => benjamin-yule.baedorf_ext.ehealthexperts.de.signature} (100%) rename users/b12f/.config/neomutt/{benjamin.baedorf@rwth-aachen.de.signature => benjamin.baedorf_rwth-aachen.de.signature} (100%) rename users/b12f/.config/neomutt/{benjamin.yule.baedorf@verkstedt.com.signature => benjamin.yule.baedorf_verkstedt.com.signature} (100%) rename users/b12f/.config/neomutt/{byb@miom.space.signature => byb_miom.space.signature} (100%) rename users/b12f/.config/neomutt/{crew@pub.solar.signature => crew_pub.solar.signature} (100%) rename users/b12f/.config/neomutt/{hello@benjaminbaedorf.eu.signature => hello_benjaminbaedorf.eu.signature} (100%) rename users/b12f/.config/neomutt/{mail@b12f.io.signature => mail_b12f.io.signature} (100%) diff --git a/lib/default.nix b/lib/default.nix index d1234df..d9cf8cf 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -13,6 +13,7 @@ deploy = import ./deploy.nix { inherit inputs lib; }; addLocalHostname = callLibs ./add-local-hostname.nix; recursiveMerge = callLibs ./recursive-merge.nix; + mkEmailAddress = account: domain: account + "@" + domain; }; }; } diff --git a/users/b12f/.config/neomutt/admins@pub.solar.signature b/users/b12f/.config/neomutt/admins_pub.solar.signature similarity index 100% rename from users/b12f/.config/neomutt/admins@pub.solar.signature rename to users/b12f/.config/neomutt/admins_pub.solar.signature diff --git a/users/b12f/.config/neomutt/benjamin-yule.baedorf@ext.ehealthexperts.de.signature b/users/b12f/.config/neomutt/benjamin-yule.baedorf_ext.ehealthexperts.de.signature similarity index 100% rename from users/b12f/.config/neomutt/benjamin-yule.baedorf@ext.ehealthexperts.de.signature rename to users/b12f/.config/neomutt/benjamin-yule.baedorf_ext.ehealthexperts.de.signature diff --git a/users/b12f/.config/neomutt/benjamin.baedorf@rwth-aachen.de.signature b/users/b12f/.config/neomutt/benjamin.baedorf_rwth-aachen.de.signature similarity index 100% rename from users/b12f/.config/neomutt/benjamin.baedorf@rwth-aachen.de.signature rename to users/b12f/.config/neomutt/benjamin.baedorf_rwth-aachen.de.signature diff --git a/users/b12f/.config/neomutt/benjamin.yule.baedorf@verkstedt.com.signature b/users/b12f/.config/neomutt/benjamin.yule.baedorf_verkstedt.com.signature similarity index 100% rename from users/b12f/.config/neomutt/benjamin.yule.baedorf@verkstedt.com.signature rename to users/b12f/.config/neomutt/benjamin.yule.baedorf_verkstedt.com.signature diff --git a/users/b12f/.config/neomutt/byb@miom.space.signature b/users/b12f/.config/neomutt/byb_miom.space.signature similarity index 100% rename from users/b12f/.config/neomutt/byb@miom.space.signature rename to users/b12f/.config/neomutt/byb_miom.space.signature diff --git a/users/b12f/.config/neomutt/crew@pub.solar.signature b/users/b12f/.config/neomutt/crew_pub.solar.signature similarity index 100% rename from users/b12f/.config/neomutt/crew@pub.solar.signature rename to users/b12f/.config/neomutt/crew_pub.solar.signature diff --git a/users/b12f/.config/neomutt/hello@benjaminbaedorf.eu.signature b/users/b12f/.config/neomutt/hello_benjaminbaedorf.eu.signature similarity index 100% rename from users/b12f/.config/neomutt/hello@benjaminbaedorf.eu.signature rename to users/b12f/.config/neomutt/hello_benjaminbaedorf.eu.signature diff --git a/users/b12f/.config/neomutt/mail@b12f.io.signature b/users/b12f/.config/neomutt/mail_b12f.io.signature similarity index 100% rename from users/b12f/.config/neomutt/mail@b12f.io.signature rename to users/b12f/.config/neomutt/mail_b12f.io.signature diff --git a/users/b12f/email.nix b/users/b12f/email.nix index c254cf5..74b0b85 100644 --- a/users/b12f/email.nix +++ b/users/b12f/email.nix @@ -2,6 +2,7 @@ lib, config, pkgs, + flake, ... }: with lib; let @@ -15,7 +16,7 @@ with lib; let realName = psCfg.user.fullName; signature = { showSignature = "append"; - text = builtins.readFile (./.config/neomutt + "/${address}.signature"); + text = builtins.readFile (./.config/neomutt + "/${builtins.replaceStrings ["@"] ["_"] address}.signature"); }; folders = { @@ -84,9 +85,9 @@ in { accounts.email = { maildirBasePath = "/home/${psCfg.user.name}/Mail"; - accounts = lib.lists.foldr (item: set: (set // { "${item.address}" = generateMailAccount item; })) {} [ + accounts = with flake.self.lib; lib.lists.foldr (item: set: (set // { "${item.address}" = generateMailAccount item; })) {} [ { - address = "hello@benjaminbaedorf.eu"; + address = mkEmailAddress "hello" "benjaminbaedorf.eu"; host = "mail.hosting.de"; config.primary = true; } @@ -95,32 +96,32 @@ in { host = "mail.b12f.io"; } { - address = "benjamin.baedorf@rwth-aachen.de"; + address = mkEmailAddress "benjamin.baedorf" "rwth-aachen.de"; host = "mail.rwth-aachen.de"; - config.userName = "bb564306@rwth-aachen.de"; + config.userName = mkEmailAddress "bb564306" "rwth-aachen.de"; } { - address = "byb@miom.space"; + address = mkEmailAddress "byb" "miom.space"; host = "mail.hosting.de"; } { - address = "admins@pub.solar"; + address = mkEmailAddress "admins" "pub.solar"; host = "mail.greenbaum.zone"; } { - address = "crew@pub.solar"; + address = mkEmailAddress "crew" "pub.solar"; host = "mail.greenbaum.zone"; } + # { + # address = mkEmailAddress "benjamin.yule.baedorf" "verkstedt.com"; + # flavor = "gmail"; + # config = { + # smtp.host = "smtp.gmail.com"; + # imap.host = "imap.gmail.com"; + # }; + # } { - address = "benjamin.yule.baedorf@verkstedt.com"; - flavor = "gmail"; - config = { - smtp.host = "smtp.gmail.com"; - imap.host = "imap.gmail.com"; - }; - } - { - address = "benjamin-yule.baedorf@ext.ehealthexperts.de"; + address = mkEmailAddress "benjamin-yule.baedorf" "ext.ehealthexperts.de"; config = { smtp.host = "smtp.mailbox.org"; imap.host = "imap.mailbox.org";