From 170d54681b0e589afde00f082e506f692e1c9d25 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 26 Nov 2020 19:53:55 +0100 Subject: realwallpaper: keep old markers if new ones are empty --- krebs/5pkgs/simple/realwallpaper/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'krebs') diff --git a/krebs/5pkgs/simple/realwallpaper/default.nix b/krebs/5pkgs/simple/realwallpaper/default.nix index 72a314ba..56a7dfb9 100644 --- a/krebs/5pkgs/simple/realwallpaper/default.nix +++ b/krebs/5pkgs/simple/realwallpaper/default.nix @@ -108,7 +108,10 @@ pkgs.writers.writeDashBin "generate-wallpaper" '' 'https://neo.sci.gsfc.nasa.gov/view.php?datasetId=MOD14A1_E_FIRE') & # regular fetches - fetch marker.json "$marker_url" & + fetch marker.json.tmp "$marker_url" + if [ -s marker.json.tmp ]; then + mv marker.json.tmp marker.json + fi fetch sun-raw.jpg 'https://sdo.gsfc.nasa.gov/assets/img/latest/latest_512_0171.jpg' & wait -- cgit v1.2.3 From 6e09a80450925194e0614fe97345efb94d147872 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 4 Dec 2020 19:20:35 +0100 Subject: exim-retiolum: add system-aliases option --- krebs/3modules/exim-retiolum.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'krebs') diff --git a/krebs/3modules/exim-retiolum.nix b/krebs/3modules/exim-retiolum.nix index 118a8b2d..a16661c9 100644 --- a/krebs/3modules/exim-retiolum.nix +++ b/krebs/3modules/exim-retiolum.nix @@ -10,6 +10,11 @@ with import ; (s: substring 1 (stringLength s - 2) s) (toJSON value); + to-lsearch = concatMapStrings ({ from, to, ... }: "${from}: ${to}\n"); + lsearch = mapAttrs (name: set: toFile name (to-lsearch set)) ({ + inherit (cfg) system-aliases; + }); + in { options.krebs.exim-retiolum = { enable = mkEnableOption "krebs.exim-retiolum"; @@ -59,6 +64,19 @@ in { }; }; }; + system-aliases = mkOption { + type = types.listOf (types.submodule ({ + options = { + from = mkOption { + type = types.str; # TODO e-mail address + }; + to = mkOption { + type = types.str; # TODO e-mail address / TODO listOf + }; + }; + })); + default = []; + }; }; imports = [ { @@ -145,6 +163,11 @@ in { begin routers + system_aliases: + debug_print = "R: system_aliases for $local_part@$domain" + driver = redirect + data = ''${lookup{$local_part}lsearch{${lsearch.system-aliases}}} + local: driver = accept domains = +local_domains -- cgit v1.2.3 From 79d680a93e006ccceec4a135a0e3a0dc210c9c9f Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 8 Dec 2020 14:59:18 +0100 Subject: nixpkgs: f41c0fc -> 3a02dc9 --- krebs/nixpkgs.json | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index b2108776..cbbc430a 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,10 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "f41c0fc7d8e49d94220f74495d4d702922df2a67", - "date": "2020-11-15T21:38:00-06:00", - "sha256": "01wim7ayn69y056q28ifw2f0mdypidpc0z15dda54aj5yy5vai09", - "fetchSubmodules": false + "rev": "3a02dc9edb283beb9580c9329f242ad705a721c3", + "date": "2020-12-07T14:46:07+01:00", + "path": "/nix/store/g3m6s3j4d69irnl5y9igq4ljcsy281x6-nixpkgs", + "sha256": "1d1lqjqqqskfg5b0hyy9q94yqzgwsnb5i0pcl71q378hl8wbgj6x", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } -- cgit v1.2.3 From 46c5284a1d6e302505ea3477ce5de6b4a286e805 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 8 Dec 2020 15:17:14 +0100 Subject: nixpkgs-unstable: a322b32 -> 83cbad9 --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index aa78bef2..31687fcb 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "a322b32e9d74fb476944ff6cfb55833dc69cfaaa", - "date": "2020-11-19T01:15:20+01:00", - "path": "/nix/store/cgb65l8rr7v7dd4hk5sv05bnmqkcgl0n-nixpkgs", - "sha256": "1r0mkiqxija75spnyksmh8x5j4smnrxv5f7768s81gsl570kls0l", + "rev": "83cbad92d73216bb0d9187c56cce0b91f9121d5a", + "date": "2020-12-07T07:45:13+00:00", + "path": "/nix/store/722gvcjwx2cxnb55bqnmkf1kirnddjib-nixpkgs", + "sha256": "12g7d0rbw6s2zb6aq1scv59p6b5xzgsqic72pf272bhsa1bymbs0", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From a695688bdf02a1e194e76deb298ab8a51df728b6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Dec 2020 15:25:00 +0100 Subject: nixpkgs: 3a02dc9 -> 3d2d8f2 --- krebs/nixpkgs.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index cbbc430a..44e373b8 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "3a02dc9edb283beb9580c9329f242ad705a721c3", - "date": "2020-12-07T14:46:07+01:00", - "path": "/nix/store/g3m6s3j4d69irnl5y9igq4ljcsy281x6-nixpkgs", - "sha256": "1d1lqjqqqskfg5b0hyy9q94yqzgwsnb5i0pcl71q378hl8wbgj6x", + "rev": "3d2d8f281a27d466fa54b469b5993f7dde198375", + "date": "2020-12-20T14:17:36+01:00", + "path": "/nix/store/mqn37480fj6x9xbq3igz4haw3m2lc7fm-nixpkgs", + "sha256": "1hfis53xyzy6hfdivlwkwdy7irbhk7c500a4lf7x43cfkijx5ks1", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3 From c6bb79ae68ee8ca3f1f2293fc6d6ccea1a99d9f2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 21 Dec 2020 15:31:00 +0100 Subject: nixpkgs-unstable: 83cbad9 -> e9158ec --- krebs/nixpkgs-unstable.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'krebs') diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json index 31687fcb..4f07b0e8 100644 --- a/krebs/nixpkgs-unstable.json +++ b/krebs/nixpkgs-unstable.json @@ -1,9 +1,9 @@ { "url": "https://github.com/NixOS/nixpkgs", - "rev": "83cbad92d73216bb0d9187c56cce0b91f9121d5a", - "date": "2020-12-07T07:45:13+00:00", - "path": "/nix/store/722gvcjwx2cxnb55bqnmkf1kirnddjib-nixpkgs", - "sha256": "12g7d0rbw6s2zb6aq1scv59p6b5xzgsqic72pf272bhsa1bymbs0", + "rev": "e9158eca70ae59e73fae23be5d13d3fa0cfc78b4", + "date": "2020-12-09T15:09:49+01:00", + "path": "/nix/store/cx4wf6pi1l2p01sz7png891m65kinfz3-nixpkgs", + "sha256": "0cnmvnvin9ixzl98fmlm3g17l6w95gifqfb3rfxs55c0wj2ddy53", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false -- cgit v1.2.3