remove specialArgs niveum and niveumLib, add overlay

systems/makanek/configuration.nix

@@ -3,9 +3,7 @@
   config,
   pkgs,
   ...
-}: let
-  inherit (import ../../lib) kieran retiolumAddresses restic;
-in {
+}: {
   imports = [
     ./gitea.nix
     ./hardware-configuration.nix
@@ -36,7 +34,7 @@ in {
 
   services.restic.backups.niveum = {
     initialize = true;
-    inherit (restic) repository;
+    repository = pkgs.lib.niveum.restic.repository;
     timerConfig = {
       OnCalendar = "daily";
       RandomizedDelaySec = "1h";
@@ -82,7 +80,7 @@ in {
     firewall.allowedTCPPorts = [80 443];
     hostName = "makanek";
     interfaces.ens3.useDHCP = true;
-    retiolum = retiolumAddresses.makanek;
+    retiolum = pkgs.lib.niveum.retiolumAddresses.makanek;
     useDHCP = false;
   };
 
@@ -115,7 +113,7 @@ in {
 
   security.acme = {
     acceptTerms = true;
-    defaults.email = kieran.email;
+    defaults.email = pkgs.lib.niveum.kieran.email;
   };
 
   services.nginx.virtualHosts."www.kmein.de" = {

systems/makanek/gitea.nix

@@ -1,6 +1,5 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 let
-  inherit (import ../../lib) sshPort;
   domain = "code.kmein.de";
 in {
   services.anubis = {
@@ -27,7 +26,7 @@ in {
     settings = {
       server.ROOT_URL = "https://${domain}";
       server.DOMAIN = domain;
-      server.SSH_PORT = sshPort;
+      server.SSH_PORT = pkgs.lib.niveum.sshPort;
       service.DISABLE_REGISTRATION = true;
     };
   };

systems/makanek/hedgedoc.nix

@@ -1,12 +1,12 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: let
   backupLocation = "/var/lib/codimd-backup";
   stateLocation = "/var/lib/codimd/state.sqlite";
   domain = "pad.kmein.de";
-  inherit (import ../../lib) tmpfilesConfig;
 in {
   services.nginx.virtualHosts.${domain} = {
     enableACME = true;
@@ -56,7 +56,7 @@ in {
   ];
 
   systemd.tmpfiles.rules = [
-    (tmpfilesConfig {
+    (pkgs.lib.niveum.tmpfilesConfig {
       user = "codimd";
       group = "codimd";
       mode = "0755";

systems/makanek/monitoring/default.nix

@@ -7,7 +7,6 @@
 let
   lokiConfig = import ./loki.nix;
   blackboxConfig = import ./blackbox.nix;
-  inherit (import ../../../lib) restic;
 in
 {
   services.grafana = {
@@ -426,7 +425,7 @@ in
         {
           targets = [
             "zaatar.r:${toString config.services.prometheus.exporters.node.port}"
-            "zaatar.r:${toString restic.port}"
+            "zaatar.r:${toString pkgs.lib.niveum.restic.port}"
           ];
         }
       ];

systems/makanek/radio-news.nix

@@ -2,7 +2,6 @@
   config,
   pkgs,
   lib,
-  niveumPackages,
   ...
 }: let
   inherit (import ../../lib) serveHtml;
@@ -25,7 +24,7 @@ in {
     script = ''
       PATH=$PATH:${lib.makeBinPath [pkgs.gnused pkgs.curl pkgs.jq]}
 
-      GEMINI_API_KEY="$(cat "$CREDENTIALS_DIRECTORY/gemini-api-key")" ${niveumPackages.radio-news}/bin/radio-news | jq --arg from "$(date -u -Is | sed 's/+00:00/Z/')" --arg to "$(date -u -Is -d 'now + 30 minutes' | sed 's/+00:00/Z/')" '
+      GEMINI_API_KEY="$(cat "$CREDENTIALS_DIRECTORY/gemini-api-key")" ${pkgs.radio-news}/bin/radio-news | jq --arg from "$(date -u -Is | sed 's/+00:00/Z/')" --arg to "$(date -u -Is -d 'now + 30 minutes' | sed 's/+00:00/Z/')" '
       {
         from: $from,
         to: $to,

systems/makanek/weechat.nix

@@ -3,9 +3,7 @@
   pkgs,
   ...
 }: let
-  inherit (import ../../lib) kieran;
   weechatHome = "/var/lib/weechat";
-  weechat-declarative = pkgs.callPackage ../../packages/weechat-declarative.nix {};
 in {
   systemd.services.weechat = let
     tmux = pkgs.writers.writeDash "tmux" ''
@@ -26,7 +24,7 @@ in {
         ''
       } "$@"
     '';
-    weechat = weechat-declarative.override {
+    weechat = pkgs.weechat-declarative.override {
       config = {
         scripts = [
           pkgs.weechatScripts.weechat-autosort
@@ -52,7 +50,7 @@ in {
               msg_part = "tschö mit ö";
               msg_quit = "ciao kakao";
               msg_kick = "warum machst du diese?";
-              realname = lib.head (lib.strings.split " " kieran.name);
+              realname = lib.head (lib.strings.split " " pkgs.lib.niveum.kieran.name);
             };
             server = {
               hackint = {

systems/makanek/weechat.sync-conflict-20250130-092406-AJVBWR2.nix

@@ -1,6 +1,5 @@
 { lib, pkgs, config, unstablePackages, ... }:
 let
-  inherit (import ../../lib) kieran;
   weechatHome = "/var/lib/weechat";
   weechat-declarative =
     pkgs.callPackage ../../packages/weechat-declarative.nix {
@@ -54,7 +53,7 @@ in {
               msg_part = "tschö mit ö";
               msg_quit = "ciao kakao";
               msg_kick = "warum machst du diese?";
-              realname = lib.head (lib.strings.split " " kieran.name);
+              realname = lib.head (lib.strings.split " " pkgs.lib.niveum.kieran.name);
             };
             server = {
               hackint = {
@@ -185,7 +184,7 @@ in {
   users.groups.weechat = { };
   users.extraUsers.weechat = {
     useDefaultShell = true;
-    openssh.authorizedKeys.keys = kieran.sshKeys ++ [
+    openssh.authorizedKeys.keys = pkgs.lib.niveum.kieran.sshKeys ++ [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC+KVDmYYH7mA8v81e9O3swXm3ZVYY9t4HP65ud61uXy weechat_android@kibbeh"
     ];
     createHome = true;