mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
Merge branch 'master' of github.com:kmein/niveum
This commit is contained in:
@@ -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;
|
||||
}
|
||||
'';
|
||||
|
||||
@@ -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 = {
|
||||
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;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user