From 2211d9ef3e17365292b0fbfafb9cf28606cd1aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 8 Jan 2019 18:24:32 +0100
Subject: [PATCH] merge

---
 config.nix           | 1 -
 configs/networks.nix | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.nix b/config.nix
index 7997a89..dabcf65 100644
--- a/config.nix
+++ b/config.nix
@@ -15,7 +15,6 @@ in {
   ];
 
   nix.optimise.automatic = true;
-  nix.gc.automatic = true;
 
   time.timeZone = "Europe/Berlin";
 
diff --git a/configs/networks.nix b/configs/networks.nix
index 9d08a35..4bb245e 100644
--- a/configs/networks.nix
+++ b/configs/networks.nix
@@ -9,8 +9,9 @@
     userControlled.enable = true;
     networks = {
       Aether = { pskRaw = "e1b18af54036c5c9a747fe681c6a694636d60a5f8450f7dec0d76bc93e2ec85a"; };
+      EasyBox-927376 = { pskRaw = "dbd490ab69b39bd67cfa06daf70fc3ef3ee90f482972a668ed758f90f5577c22"; };
       "Asoziales Netzwerk" = { pskRaw = "8e234041ec5f0cd1b6a14e9adeee9840ed51b2f18856a52137485523e46b0cb6"; };
-      "c-base-public" = {};
+      c-base-public = {};
     };
   };