Merge branch 'master' of github.com:kmein/niveum

config.nix

@@ -51,9 +51,7 @@ in {
 
   services.cron = {
     enable = true;
-    systemCronJobs = [
+    systemCronJobs = [];
-      "0 18 * * * ${scripts.bing-wallpaper}"
-    ];
   };
 
   programs.ssh = {
@@ -185,7 +183,7 @@ in {
     };
 
     home.file = {
-      ".background-image".source = config.constants.wallpaper;
+      ".background-image".source = ./art/37333571_p0_master1200.jpg;
       ".config/mpv/input.conf".text = import ./dot/mpv.nix;
       ".config/xfce4/terminal/terminalrc".text = import ./dot/terminal.nix;
       ".config/zathura/zathurarc".text = "set selection-clipboard clipboard";

configs/graphics.nix

@@ -116,7 +116,7 @@ let
         time_t now = time(NULL);
         struct tm *today = localtime(&now);
         wchar_t roman_month = 0x2160 + today->tm_mon;
-        wprintf(L"%d\u2009%lc\u2009%d [%d]\n", today->tm_mday, roman_month, 1900 + today->tm_year, today->tm_yday/7 + 1);
+        wprintf(L"%d\u2009%lc\u2009%d [%d|%d]\n", today->tm_mday, roman_month, 1900 + today->tm_year, today->tm_wday == 0 ? 7 : today->tm_wday, today->tm_yday/7 + 1);
         return 0;
     }
   '';

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"
+        altsubject_match="DNS:srv1-radius.cms.hu-berlin.de;DNS:srv2-radius.cms.hu-berlin.de"
+        password="${eduroam.password}"
+        ca_cert="${builtins.fetchurl https://www.cms.hu-berlin.de/de/dl/netze/wlan/config/eduroam/t-telesec_globalroot_class_2.pem}"
+        phase2="auth=PAP"
+      '';
+    };
 in {
   networking.hosts = {
     "192.168.178.27" = [ "printer.local" ];
@@ -12,17 +26,7 @@ in {
     "c-base-public" = {};
     "FlixBus" = {};
     "FlixBus Wi-Fi" = {};
-    eduroam = {
+    eduroam = eduroamConfig;
-      auth = ''
+    eduroam_5GHz = eduroamConfig;
-        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"
-      '';
-    };
   };
 }

options.nix

@@ -36,11 +36,6 @@ in {
       gtk = { name = "Paper"; package = pkgs.paper-gtk-theme; };
       icon = { name = "Paper"; package = pkgs.paper-icon-theme; };
     };
-
-    wallpaper = mkOption {
-      type = types.path;
-      default = pkgs.copyPathToStore ./art/haskell-grey.png;
-    };
   };
 
 }