Merge remote-tracking branch 'gum/master'

krebs/3modules/makefu/retiolum/latte_ed25519.pub

@@ -1 +1 @@
-Ed25519PublicKey = ILtT9Y5pGBtc5/wR56RYzzYeZMvmmutaC6IED6I1oTI
+ILtT9Y5pGBtc5/wR56RYzzYeZMvmmutaC6IED6I1oTI

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" ];
   };
 }

makefu/1systems/latte/config.nix

@@ -10,24 +10,39 @@ let
 in {
 
   imports = [
-    ./1blu
+      ./1blu
-    <stockholm/makefu>
+      <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>
 
-    # Security
+      # common
-    <stockholm/makefu/2configs/sshd-totp.nix>
+      <stockholm/makefu/2configs/nur.nix>
-    # <stockholm/makefu/2configs/stats/client.nix>
+      <stockholm/makefu/2configs/home-manager>
+      <stockholm/makefu/2configs/home-manager/cli.nix>
 
-    # Tools
+      # Security
-    <stockholm/makefu/2configs/tools/core.nix>
+      <stockholm/makefu/2configs/sshd-totp.nix>
-    <stockholm/makefu/2configs/zsh-user.nix>
+
-    # Services
+      # Tools
-    <stockholm/makefu/2configs/remote-build/slave.nix>
+      <stockholm/makefu/2configs/tools/core.nix>
-    # <stockholm/makefu/2configs/torrent.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 = {