From 66341414c5fe2e440acdd3b77178b7826dcded23 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 17 Feb 2022 22:46:55 +0100
Subject: [PATCH 1/2] ma retiolum: fix ed25519 for latte

---
 krebs/3modules/makefu/retiolum/latte_ed25519.pub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/krebs/3modules/makefu/retiolum/latte_ed25519.pub b/krebs/3modules/makefu/retiolum/latte_ed25519.pub
index f987f3077..7974bb6e5 100644
--- a/krebs/3modules/makefu/retiolum/latte_ed25519.pub
+++ b/krebs/3modules/makefu/retiolum/latte_ed25519.pub
@@ -1 +1 @@
-Ed25519PublicKey = ILtT9Y5pGBtc5/wR56RYzzYeZMvmmutaC6IED6I1oTI
+ILtT9Y5pGBtc5/wR56RYzzYeZMvmmutaC6IED6I1oTI

From ee9c23c4bb5737b77df0fed9385e7b30604da0de Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 18 Feb 2022 09:22:59 +0100
Subject: [PATCH 2/2] ma latte.r: continue migration of gum services

---
 makefu/1systems/latte/1blu/network.nix |  1 +
 makefu/1systems/latte/config.nix       | 47 +++++++++++++++++---------
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/makefu/1systems/latte/1blu/network.nix b/makefu/1systems/latte/1blu/network.nix
index 065a69013..0a0eac972 100644
--- a/makefu/1systems/latte/1blu/network.nix
+++ b/makefu/1systems/latte/1blu/network.nix
@@ -27,5 +27,6 @@ in
     };
     defaultGateway6 = { address = external-gw6; interface = ext-if; };
     defaultGateway = external-gw;
+    nameservers = [ "1.1.1.1" ];
   };
 }
diff --git a/makefu/1systems/latte/config.nix b/makefu/1systems/latte/config.nix
index 27df80fbf..fdd3df192 100644
--- a/makefu/1systems/latte/config.nix
+++ b/makefu/1systems/latte/config.nix
@@ -10,24 +10,39 @@ let
 in {
 
   imports = [
-    ./1blu
-    <stockholm/makefu>
-    #<stockholm/makefu/2configs/home-manager>
-    # configure your hw:
-    #<stockholm/makefu/2configs/hw/CAC.nix>
-    <stockholm/makefu/2configs/tinc/retiolum.nix>
-    #<stockholm/makefu/2configs/save-diskspace.nix>
+      ./1blu
+      <stockholm/makefu>
 
-    # Security
-    <stockholm/makefu/2configs/sshd-totp.nix>
-    # <stockholm/makefu/2configs/stats/client.nix>
+      # common
+      <stockholm/makefu/2configs/nur.nix>
+      <stockholm/makefu/2configs/home-manager>
+      <stockholm/makefu/2configs/home-manager/cli.nix>
 
-    # Tools
-    <stockholm/makefu/2configs/tools/core.nix>
-    <stockholm/makefu/2configs/zsh-user.nix>
-    # Services
-    <stockholm/makefu/2configs/remote-build/slave.nix>
-    # <stockholm/makefu/2configs/torrent.nix>
+      # Security
+      <stockholm/makefu/2configs/sshd-totp.nix>
+
+      # Tools
+      <stockholm/makefu/2configs/tools/core.nix>
+      <stockholm/makefu/2configs/zsh-user.nix>
+
+      # NixOS Build
+      <stockholm/makefu/2configs/remote-build/slave.nix>
+
+      # Storage
+      <stockholm/makefu/2configs/share/hetzner-client.nix>
+
+      # Services:
+      <stockholm/makefu/2configs/nix-community/mediawiki-matrix-bot.nix>
+
+      # Supervision
+      <stockholm/makefu/2configs/nix-community/supervision.nix>
+
+      # Krebs
+      <stockholm/makefu/2configs/tinc/retiolum.nix>
+
+      #<stockholm/makefu/2configs/home-manager>
+      # configure your hw:
+      # <stockholm/makefu/2configs/torrent.nix>
 
   ];
   krebs = {