remove specialArgs niveum and niveumLib, add overlay

systems/ful/configuration.nix

@@ -3,9 +3,7 @@
   pkgs,
   lib,
   ...
-}: let
-  inherit (import ../../lib) kieran retiolumAddresses restic;
-in {
+}: {
   imports = [
     ./hardware-configuration.nix
     ./matomo.nix
@@ -60,7 +58,7 @@ in {
 
   services.restic.backups.niveum = {
     initialize = true;
-    inherit (restic) repository;
+    repository = pkgs.lib.niveum.restic.repository;
     timerConfig = {
       OnCalendar = "daily";
       RandomizedDelaySec = "1h";
@@ -75,7 +73,7 @@ in {
     firewall.allowedTCPPorts = [80 443];
     hostName = "ful";
     interfaces.enp0s3.useDHCP = true;
-    retiolum = retiolumAddresses.ful;
+    retiolum = pkgs.lib.niveum.retiolumAddresses.ful;
     useDHCP = false;
   };
 
@@ -92,7 +90,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    defaults.email = kieran.email;
+    defaults.email = pkgs.lib.niveum.kieran.email;
   };
 
   users.users.root.hashedPasswordFile = config.age.secrets.root.path;

systems/ful/go-webring.nix

@@ -1,4 +1,4 @@
-{ config, niveumPackages ,... }:
+{ config, pkgs, ... }:
 let
   port = 2857;
 in
@@ -7,7 +7,7 @@ in
     enable = true;
     host = "dichtungsring.kmein.de";
     listenAddress = "127.0.0.1:${toString port}";
-    package = niveumPackages.go-webring;
+    package = pkgs.go-webring;
     members = [
       { username = "meteora"; site = "meteora.xn--kiern-0qa.de"; }
       { username = "huldra"; site = "huldras-halbtraum.com"; }

systems/ful/matomo.nix

@@ -1,6 +1,4 @@
-{pkgs, ...}: let
-  inherit (import ../../lib) kieran;
-in {
+{pkgs, lib, ...}: {
   services.nginx = {
     enable = true;
     recommendedGzipSettings = true;
@@ -12,7 +10,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    defaults.email = kieran.email;
+    defaults.email = pkgs.lib.niveum.kieran.email;
   };
 
   services.matomo = {

systems/ful/panoptikon.nix

@@ -2,13 +2,9 @@
   config,
   pkgs,
   lib,
-  niveumLib,
-  niveumPackages,
   ...
 }: let
-  panoptikon = niveumLib.panoptikon {inherit pkgs lib niveumPackages config;};
-
-  irc-xxx = panoptikon.kpaste-irc {
+  irc-xxx = lib.panoptikon.kpaste-irc {
     target = lib.escapeShellArg "#xxx";
     retiolumLink = true;
   };
@@ -41,7 +37,7 @@
         | ${pkgs.jq}/bin/jq -e .ok
     '';
 
-  irc-kmein = panoptikon.kpaste-irc {
+  irc-kmein = lib.panoptikon.kpaste-irc {
     messagePrefix = "$PANOPTIKON_WATCHER: ";
     target = "kmein";
     nick = "panoptikon-kmein";
@@ -60,7 +56,7 @@ in {
     enable = true;
     watchers = {
       "github-meta" = {
-        script = panoptikon.urlJSON {
+        script = lib.panoptikon.urlJSON {
           jqScript = ''
             {
               ssh_key_fingerprints: .ssh_key_fingerprints,
@@ -71,79 +67,79 @@ in {
         reporters = [irc-xxx];
       };
       lammla = {
-        script = panoptikon.url "http://lammla.info/index.php?reihe=30";
+        script = lib.panoptikon.url "http://lammla.info/index.php?reihe=30";
         reporters = [matrix-kmein];
       };
       kratylos = {
-        script = panoptikon.url "https://kratylos.reichert-online.org/current_issue/KRATYLOS";
+        script = lib.panoptikon.url "https://kratylos.reichert-online.org/current_issue/KRATYLOS";
         reporters = [matrix-kmein];
       };
       kobudo-tesshinkan = {
-        script = panoptikon.url "https://kobudo-tesshinkan.eu/index.php/de/termine-berichte/lehrgaenge/";
+        script = lib.panoptikon.url "https://kobudo-tesshinkan.eu/index.php/de/termine-berichte/lehrgaenge/";
         reporters = [telegram-kmein matrix-kmein];
       };
       zeno-free = {
-        script = panoptikon.urlSelector ".zenoCOMain" "http://www.zeno.org/Lesesaal/M/E-Books";
+        script = lib.panoptikon.urlSelector ".zenoCOMain" "http://www.zeno.org/Lesesaal/M/E-Books";
         reporters = [matrix-kmein];
       };
       carolinawelslau = {
-        script = panoptikon.urlSelector "#main" "https://carolinawelslau.de/";
+        script = lib.panoptikon.urlSelector "#main" "https://carolinawelslau.de/";
         reporters = [matrix-kmein];
       };
       humboldt-preis = {
-        script = panoptikon.urlSelector "#content-core" "https://www.hu-berlin.de/de/ueberblick/menschen/ehrungen/humboldtpreis";
+        script = lib.panoptikon.urlSelector "#content-core" "https://www.hu-berlin.de/de/ueberblick/menschen/ehrungen/humboldtpreis";
         reporters = [matrix-kmein];
       };
       lisalittmann = {
-        script = panoptikon.urlSelector "#site-content" "https://lisalittmann.de/";
+        script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/";
         reporters = [matrix-kmein];
       };
       lisalittmann-archive = {
-        script = panoptikon.urlSelector "#site-content" "https://lisalittmann.de/archive/";
+        script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/archive/";
         reporters = [matrix-kmein];
       };
       lisalittmann-projects = {
-        script = panoptikon.urlSelector "#site-content" "https://lisalittmann.de/projects/";
+        script = lib.panoptikon.urlSelector "#site-content" "https://lisalittmann.de/projects/";
         reporters = [matrix-kmein];
       };
       tatort = {
-        script = panoptikon.urlSelector ".linklist" "https://www.daserste.de/unterhaltung/krimi/tatort/sendung/index.html";
+        script = lib.panoptikon.urlSelector ".linklist" "https://www.daserste.de/unterhaltung/krimi/tatort/sendung/index.html";
         reporters = [matrix-kmein];
       };
       warpgrid-idiomarium = {
-        script = panoptikon.urlSelector "#site-content" "https://warpgrid.de/idiomarium/";
+        script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/idiomarium/";
         reporters = [matrix-kmein];
       };
       warpgrid-futurism = {
-        script = panoptikon.urlSelector "#site-content" "https://warpgrid.de/futurism/";
+        script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/futurism/";
         reporters = [matrix-kmein];
       };
       warpgrid-imagiary = {
-        script = panoptikon.urlSelector "#site-content" "https://warpgrid.de/imagiary/";
+        script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/imagiary/";
         reporters = [matrix-kmein];
       };
       warpgrid-alchemy = {
-        script = panoptikon.urlSelector "#site-content" "https://warpgrid.de/alchemy/";
+        script = lib.panoptikon.urlSelector "#site-content" "https://warpgrid.de/alchemy/";
         reporters = [matrix-kmein];
       };
       indogermanische-forschungen = {
-        script = panoptikon.urlSelector "#latestIssue" "https://www.degruyter.com/journal/key/INDO/html";
+        script = lib.panoptikon.urlSelector "#latestIssue" "https://www.degruyter.com/journal/key/INDO/html";
         reporters = [matrix-kmein];
       };
       ig-neuigkeiten = {
-        script = panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/aktuelles/neuigkeiten.html";
+        script = lib.panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/aktuelles/neuigkeiten.html";
         reporters = [matrix-kmein];
       };
       ig-tagungen = {
-        script = panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/tagungen/tagungen-der-ig.html";
+        script = lib.panoptikon.urlSelector "[itemprop=articleBody]" "https://www.indogermanistik.org/tagungen/tagungen-der-ig.html";
         reporters = [matrix-kmein];
       };
       fu-distant = {
-        script = panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/en/e/ma-distant/Termine/index.html";
+        script = lib.panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/en/e/ma-distant/Termine/index.html";
         reporters = [matrix-kmein];
       };
       fu-aegyptologie = {
-        script = panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/e/aegyptologie/termine/index.html";
+        script = lib.panoptikon.urlSelector "#current_events" "https://www.geschkult.fu-berlin.de/e/aegyptologie/termine/index.html";
         reporters = [matrix-kmein];
       };
     };

systems/ful/radio.nix

@@ -1,11 +1,9 @@
 {
-  lib,
   pkgs,
   config,
-  niveumPackages,
+  lib,
   ...
 }: let
-  inherit (import ../../lib) tmpfilesConfig;
   liquidsoapDirectory = "/var/cache/liquidsoap";
   icecastPassword = "hackme";
   refresh-qasaid = pkgs.writers.writeDashBin "refresh-qasaid" ''
@@ -23,7 +21,7 @@
             poem: .[0].["#text"],
             author: .[1].["#text"]
           })
-      ' | ${niveumPackages.cyberlocker-tools}/bin/cput qasaid.json
+      ' | ${pkgs.cyberlocker-tools}/bin/cput qasaid.json
   '';
   qasida-poem = pkgs.writers.writeDash "qasida.sh" ''
     set -efu
@@ -136,7 +134,7 @@ in {
   environment.systemPackages = [refresh-qasaid];
 
   systemd.tmpfiles.rules = [
-    (tmpfilesConfig {
+    (pkgs.lib.niveum.tmpfilesConfig {
       type = "d";
       path = liquidsoapDirectory;
       mode = "0750";