diff --git a/art/haskell-grey.png b/art/.haskell-grey.png similarity index 100% rename from art/haskell-grey.png rename to art/.haskell-grey.png diff --git a/art/37333571_p0_master1200.jpg b/art/37333571_p0_master1200.jpg new file mode 100644 index 0000000..8fb2fc1 Binary files /dev/null and b/art/37333571_p0_master1200.jpg differ diff --git a/art/55991392_p0_master1200.jpg b/art/55991392_p0_master1200.jpg new file mode 100644 index 0000000..69123c5 Binary files /dev/null and b/art/55991392_p0_master1200.jpg differ diff --git a/art/57761164_p0_master1200.jpg b/art/57761164_p0_master1200.jpg new file mode 100644 index 0000000..67f59bc Binary files /dev/null and b/art/57761164_p0_master1200.jpg differ diff --git a/art/58991926_p0_master1200.jpg b/art/58991926_p0_master1200.jpg new file mode 100644 index 0000000..e93d7b4 Binary files /dev/null and b/art/58991926_p0_master1200.jpg differ diff --git a/art/59560674_p0_master1200.jpg b/art/59560674_p0_master1200.jpg new file mode 100644 index 0000000..98605c3 Binary files /dev/null and b/art/59560674_p0_master1200.jpg differ diff --git a/art/68479906_p0_master1200.jpg b/art/68479906_p0_master1200.jpg new file mode 100644 index 0000000..e5ec240 Binary files /dev/null and b/art/68479906_p0_master1200.jpg differ diff --git a/art/69915574_p0_master1200.jpg b/art/69915574_p0_master1200.jpg new file mode 100644 index 0000000..ed6fb96 Binary files /dev/null and b/art/69915574_p0_master1200.jpg differ diff --git a/art/the_view_by_xlocky-d988pnv.jpg b/art/the_view_by_xlocky-d988pnv.jpg new file mode 100644 index 0000000..d4deabf Binary files /dev/null and b/art/the_view_by_xlocky-d988pnv.jpg differ diff --git a/art/tumblr_p3p4cdjUB61qe959eo1_1280.jpg b/art/tumblr_p3p4cdjUB61qe959eo1_1280.jpg new file mode 100644 index 0000000..758f474 Binary files /dev/null and b/art/tumblr_p3p4cdjUB61qe959eo1_1280.jpg differ diff --git a/config.nix b/config.nix index 726725f..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 = { @@ -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"; diff --git a/configs/graphics.nix b/configs/graphics.nix index 3ef391f..e2d6dc6 100644 --- a/configs/graphics.nix +++ b/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; } ''; diff --git a/configs/networks.nix b/configs/networks.nix index 4e696d8..1dad5b2 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" + 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; }; } diff --git a/options.nix b/options.nix index 66cc894..d574dcc 100644 --- a/options.nix +++ b/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; - }; }; }