From 5239bcb997d231fd8386e3b447595f0a5acb2427 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Mon, 21 Mar 2022 00:27:05 +0100
Subject: [PATCH] Bump private

---
 nixos/machines/hera/web.nix | 24 ++++++++++--------------
 nixos/roles/fonts.nix       | 10 ++++++----
 private                     |  2 +-
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/nixos/machines/hera/web.nix b/nixos/machines/hera/web.nix
index 36eccd59..75d65f1e 100644
--- a/nixos/machines/hera/web.nix
+++ b/nixos/machines/hera/web.nix
@@ -18,11 +18,6 @@ in {
     nginx = {
       enable = lib.mkForce pkgs.withSecrets;
       virtualHosts = {
-        "stream.maralorn.de" = {
-          forceSSL = true;
-          enableACME = true;
-          locations."/".proxyPass = "http://[${config.m-0.hosts.apollo-wg}]:8123";
-        };
         "tasks.maralorn.de" = {
           forceSSL = true;
           enableACME = true;
@@ -32,7 +27,6 @@ in {
           };
         };
         "hera.m-0.eu" = {
-          serverAliases = ["malte-und-clai.re"];
           default = true;
           forceSSL = true;
           enableACME = true;
@@ -43,15 +37,17 @@ in {
           forceSSL = true;
           inherit locations;
         };
-        "fdroid.maralorn.de" = {
-          forceSSL = true;
-          enableACME = true;
-          locations = {
-            "/" = {
-              root = "/var/www/fdroid/repo";
+        "fdroid.maralorn.de" =
+          {
+            forceSSL = true;
+            enableACME = true;
+            locations = {
+              "/" = {
+                root = "/var/www/fdroid/repo";
+              };
             };
-          };
-        };
+          }
+          // pkgs.privateValue {} "extra-sites";
       };
     };
   };
diff --git a/nixos/roles/fonts.nix b/nixos/roles/fonts.nix
index 8b1897a7..53609d90 100644
--- a/nixos/roles/fonts.nix
+++ b/nixos/roles/fonts.nix
@@ -19,14 +19,16 @@
     fonts = builtins.attrValues {
       inherit
         (pkgs)
-        nerdfonts
         # For all my terminal needs.
-        libertinus
+        nerdfonts
         # nice text font
-        material-icons
+        libertinus
         # icons in my app
+        material-icons
+        # sans font, very good for displays
         b612
-        ; # sans font, very good for displays
+        google-fonts
+        ;
     };
   };
 
diff --git a/private b/private
index 46bcf2a4..f069ac78 160000
--- a/private
+++ b/private
@@ -1 +1 @@
-Subproject commit 46bcf2a4899054b73a911b91185f92bfbbcb8ae5
+Subproject commit f069ac78040ccacb9dd6250f4ee4f57cb6b1bc22