From 5b6a58ec311789532077a16e28eacb7539978390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Mon, 22 Oct 2018 09:58:55 +0200
Subject: [PATCH] Remove unused cron-job; add eduroam_5GHz

---
 config.nix           |  4 +---
 configs/networks.nix | 30 +++++++++++++++++-------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/config.nix b/config.nix
index d2ba453..df9a9cb 100644
--- a/config.nix
+++ b/config.nix
@@ -51,9 +51,7 @@ in {
 
   services.cron = {
     enable = true;
-    systemCronJobs = [
-      "0 18 * * * ${scripts.bing-wallpaper}"
-    ];
+    systemCronJobs = [];
   };
 
   programs.ssh = {
diff --git a/configs/networks.nix b/configs/networks.nix
index 4e696d8..2297c0f 100644
--- a/configs/networks.nix
+++ b/configs/networks.nix
@@ -1,4 +1,18 @@
-let eduroam = (import ../secrets.nix).eduroam;
+let
+  eduroam = (import ../secrets.nix).eduroam;
+  eduroamConfig = {
+      auth = ''
+        key_mgmt=WPA-EAP
+        eap=TTLS
+        proto=RSN
+        identity="${eduroam.identity}"
+        anonymous_identity="anonymous@cms.hu-berlin.de"
+        password="${eduroam.password}"
+        ca_cert=${builtins.readFile ../deutsche-telekom-root-ca-2.crt}
+        phase2="auth=PAP"
+      '';
+        #ca_cert="${builtins.fetchurl https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/deutsche-telekom-root-ca-2.crt}"
+    };
 in {
   networking.hosts = {
     "192.168.178.27" = [ "printer.local" ];
@@ -12,17 +26,7 @@ in {
     "c-base-public" = {};
     "FlixBus" = {};
     "FlixBus Wi-Fi" = {};
-    eduroam = {
-      auth = ''
-        key_mgmt=WPA-EAP
-        eap=TTLS
-        proto=RSN
-        identity="${eduroam.identity}"
-        anonymous_identity="anonymous@cms.hu-berlin.de"
-        password="${eduroam.password}"
-        ca_cert="${builtins.fetchurl https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/deutsche-telekom-root-ca-2.crt}"
-        phase2="auth=PAP"
-      '';
-    };
+    eduroam = eduroamConfig;
+    eduroam_5GHz = eduroamConfig;
   };
 }