ssh: separate mezza account for git.pub.solar

hosts/frikandel/unbound.nix

@@ -56,6 +56,7 @@
         ];
         local-zone = [
           "\"b12f.io\" transparent"
+          "\"pub.solar\" transparent"
         ];
         local-data = [
           "\"stroopwafel.b12f.io. 10800 IN A 10.13.12.5\""
@@ -106,6 +107,8 @@
           "\"h${"w" + "dz" + "z.n"}et. 10800 IN AAAA fd00:b12f:acab:1312:acab:7::\""
           "\"mail.h${"w" + "dz" + "z.n"}et. 10800 IN A 10.13.12.7\""
           "\"mail.h${"w" + "dz" + "z.n"}et. 10800 IN AAAA fd00:b12f:acab:1312:acab:7::\""
+
+          "\"mezza.git.pub.solar. 10800 IN CNAME git.pub.solar\""
         ];
 
         tls-cert-bundle = "/etc/ssl/certs/ca-certificates.crt";

users/b12f/email.nix

@@ -137,6 +137,16 @@ in {
             address = mkEmailAddress "crew" "pub.solar";
             host = "mail.pub.solar";
           }
+          {
+            address = mkEmailAddress "mail" "momo.koeln";
+            host = "mail.momo.koeln";
+            emptysignature = true;
+          }
+          {
+            address = mkEmailAddress "admins" "momo.koeln";
+            host = "mail.momo.koeln";
+            emptysignature = true;
+          }
           # {
           #   address = mkEmailAddress "benjamin.yule.baedorf" "verkstedt.com";
           #   flavor = "gmail";
@@ -172,6 +182,7 @@ in {
     programs.msmtp.enable = true;
     programs.neomutt = {
       enable = true;
+      sort = "reverse-threads";
       binds = [
         # Moving around
         {

users/b12f/ssh.nix

@@ -32,16 +32,21 @@ in {
       enable = true;
       extraConfig = ''
         IdentitiesOnly yes
-        IdentityFile /home/${psCfg.user.name}/.ssh/id_yubi_gpg.pub
-        IdentityFile /home/${psCfg.user.name}/.ssh/id_ed25519_mezza
-        IdentityFile /home/${psCfg.user.name}/.ssh/id_ed25519_sk-464
-        IdentityFile /home/${psCfg.user.name}/.ssh/id_ed25519_sk-485
       '';
       matchBlocks = {
+        "* !mezza.git.pub.solar".extraOptions = {
+          IdentityFile = "/home/${psCfg.user.name}/.ssh/id_yubi_gpg.pub";
+        };
+
         "git.pub.solar" = {
           user = "gitea";
         };
 
+        "mezza.git.pub.solar" = {
+          user = "gitea";
+          identityFile = "/home/${psCfg.user.name}/.ssh/id_ed25519_mezza";
+        };
+
         "aur.archlinux.org" = {
           user = "aur";
         };