init flake.nix

62 files changed, 205 insertions, 203 deletions

diff --git a/krebs/0tests/data/secrets/radicale.id_ed25519 b/krebs/0tests/data/secrets/radicale.id_ed25519
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/krebs/0tests/data/secrets/radicale.id_ed25519
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 683556081..d5e3e7d87 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -1,24 +1,24 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, stockholm ? { outPath = <stockholm>; lib = <stockholm/lib> {}; }, ... }:
 
 {
   imports = [
-    <stockholm/krebs>
-    <stockholm/krebs/2configs>
+    (stockholm.outPath + "/krebs")
+    (stockholm.outPath + "/krebs/2configs")
 
-    <stockholm/krebs/2configs/buildbot-stockholm.nix>
-    <stockholm/krebs/2configs/binary-cache/nixos.nix>
-    <stockholm/krebs/2configs/ircd.nix>
-    <stockholm/krebs/2configs/reaktor2.nix>
-    <stockholm/krebs/2configs/wiki.nix>
-    <stockholm/krebs/2configs/acme.nix>
-    <stockholm/krebs/2configs/mud.nix>
-    <stockholm/krebs/2configs/repo-sync.nix>
+    (stockholm.outPath + "/krebs/2configs/buildbot-stockholm.nix")
+    (stockholm.outPath + "/krebs/2configs/binary-cache/nixos.nix")
+    (stockholm.outPath + "/krebs/2configs/ircd.nix")
+    (stockholm.outPath + "/krebs/2configs/reaktor2.nix")
+    (stockholm.outPath + "/krebs/2configs/wiki.nix")
+    (stockholm.outPath + "/krebs/2configs/acme.nix")
+    (stockholm.outPath + "/krebs/2configs/mud.nix")
+    (stockholm.outPath + "/krebs/2configs/repo-sync.nix")
 
-    <stockholm/krebs/2configs/cal.nix>
-    <stockholm/krebs/2configs/mastodon.nix>
+    (stockholm.outPath + "/krebs/2configs/cal.nix")
+    (stockholm.outPath + "/krebs/2configs/mastodon.nix")
 
-    ## shackie irc bot
-    <stockholm/krebs/2configs/shack/reaktor.nix>
+    ## (shackie irc bot
+    (stockholm.outPath + "/krebs/2configs/shack/reaktor.nix")
   ];
 
   krebs.build.host = config.krebs.hosts.hotdog;
diff --git a/krebs/2configs/backup.nix b/krebs/2configs/backup.nix
index 7ee438784..83dbf66fb 100644
--- a/krebs/2configs/backup.nix
+++ b/krebs/2configs/backup.nix
@@ -1,5 +1,5 @@
 { config, lib, ... }:
-with import <stockholm/lib>;
+with lib;
 {
   krebs.backup.plans = {
   } // mapAttrs (_: recursiveUpdate {
diff --git a/krebs/2configs/cal.nix b/krebs/2configs/cal.nix
index 15f0027b3..f8346cf1e 100644
--- a/krebs/2configs/cal.nix
+++ b/krebs/2configs/cal.nix
@@ -23,13 +23,13 @@
     git add .gitignore
   '';
 
-  pushCal = pkgs.writeDash "push_cal" ''
+  pushCal = pkgs.writers.writeDash "push_cal" ''
     ${setupGit}
     git fetch origin
     git merge --ff-only origin/master || :
   '';
 
-  pushCgit = pkgs.writeDash "push_cgit" ''
+  pushCgit = pkgs.writers.writeDash "push_cgit" ''
     ${setupGit}
     git push origin master
   '';
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 45ff61baf..2080c1362 100644
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@@ -1,5 +1,5 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
+with pkgs.stockholm.lib;
 
 let
   #for shared state directory
@@ -22,7 +22,7 @@ let
         # TODO; get state as argument
         state_file = "${stateDir}/ledger";
       };
-      filename = pkgs.writeDash "bedger-add" ''
+      filename = pkgs.writers.writeDash "bedger-add" ''
         set -x
         tonick=$1
         amt=$2
@@ -42,7 +42,7 @@ let
       env = {
         state_file = "${stateDir}/ledger";
       };
-      filename = pkgs.writeDash "bedger-balance" ''
+      filename = pkgs.writers.writeDash "bedger-balance" ''
         ${pkgs.hledger}/bin/hledger -f $state_file bal -N -O csv \
           | ${pkgs.coreutils}/bin/tail +2 \
           | ${pkgs.miller}/bin/mlr --icsv --opprint cat \
@@ -57,7 +57,7 @@ let
     arguments = [1];
     timeoutSec = 1337;
     command = {
-      filename = pkgs.writeDash "bing" ''
+      filename = pkgs.writers.writeDash "bing" ''
         set -efu
         report_error() {
           printf '%s' "$*" |
@@ -97,7 +97,7 @@ let
     arguments = [1];
     timeoutSec = 1337;
     command = {
-      filename = pkgs.writeDash "bing-img" ''
+      filename = pkgs.writers.writeDash "bing-img" ''
         set -efu
         report_error() {
           printf '%s' "$*" |
@@ -142,7 +142,7 @@ let
     activate = "match";
     arguments = [1];
     command = {
-      filename = pkgs.writeDash "confuse" ''
+      filename = pkgs.writers.writeDash "confuse" ''
         set -efux
 
         export PATH=${makeBinPath [
@@ -164,7 +164,7 @@ let
     activate = "match";
     arguments = [1];
     command = {
-      filename = pkgs.writeDash "interrogate" ''
+      filename = pkgs.writers.writeDash "interrogate" ''
         set -efux
 
         export PATH=${makeBinPath [
@@ -181,7 +181,7 @@ let
     activate = "match";
     arguments = [1];
     command = {
-      filename = pkgs.writeDash "confuse" ''
+      filename = pkgs.writers.writeDash "confuse" ''
         set -efu
         export PATH=${makeBinPath [
           pkgs.coreutils
@@ -204,7 +204,7 @@ let
     activate = "match";
     arguments = [1];
     command = {
-      filename = pkgs.writeDash "say" ''
+      filename = pkgs.writers.writeDash "say" ''
         set -efu
 
         export PATH=${makeBinPath [
@@ -234,20 +234,20 @@ let
     arguments = [2];
     env.TASKDATA = "${stateDir}/${name}";
     commands = rec {
-      add.filename = pkgs.writeDash "${name}-task-add" ''
+      add.filename = pkgs.writers.writeDash "${name}-task-add" ''
         ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} add "$1"
       '';
-      list.filename = pkgs.writeDash "${name}-task-list" ''
+      list.filename = pkgs.writers.writeDash "${name}-task-list" ''
         ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} export \
           | ${pkgs.jq}/bin/jq -r '
               .[] | select(.id != 0) | "\(.id) \(.description)"
             '
       '';
-      delete.filename = pkgs.writeDash "${name}-task-delete" ''
+      delete.filename = pkgs.writers.writeDash "${name}-task-delete" ''
         ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} delete "$1"
       '';
       del = delete;
-      done.filename = pkgs.writeDash "${name}-task-done" ''
+      done.filename = pkgs.writers.writeDash "${name}-task-done" ''
         ${pkgs.taskwarrior}/bin/task rc:${taskRcFile} done "$1"
       '';
     };
@@ -294,7 +294,7 @@ let
           activate = "always";
           command = {
             filename =
-              <stockholm/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh>;
+             pkgs.stockholm.outPath + "/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh";
             env = {
               PATH = makeBinPath [
                 pkgs.coreutils # XXX env, touch
@@ -311,7 +311,7 @@ let
           pattern = "^list-locations";
           activate = "match";
           command = {
-            filename = pkgs.writeDash "list-locations" ''
+            filename = pkgs.writers.writeDash "list-locations" ''
               export PATH=${makeBinPath [
                 pkgs.curl
                 pkgs.jq
@@ -328,7 +328,7 @@ let
           activate = "match";
           arguments = [1 2 3];
           command = {
-            filename = pkgs.writeDash "add-location" ''
+            filename = pkgs.writers.writeDash "add-location" ''
               export PATH=${makeBinPath [
                 pkgs.curl
                 pkgs.jq
@@ -345,7 +345,7 @@ let
           activate = "match";
           arguments = [1];
           command = {
-            filename = pkgs.writeDash "add-location" ''
+            filename = pkgs.writers.writeDash "add-location" ''
               export PATH=${makeBinPath [
                 pkgs.curl
                 pkgs.jq
@@ -374,7 +374,7 @@ let
                 sha256 = "sha256-J7jGWZeAULDA1EkO50qx+hjl+5IsUj389pUUMreKeNE=";
               };
               osm-restaurants = pkgs.callPackage "${osm-restaurants-src}/osm-restaurants" {};
-            in pkgs.writeDash "krebsfood" ''
+            in pkgs.writers.writeDash "krebsfood" ''
               set -efu
               export PATH=${makeBinPath [
                 osm-restaurants
@@ -418,7 +418,7 @@ let
           inherit (commands) dance random-emoji nixos-version;
           tell = {
             filename =
-              <stockholm/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh>;
+              pkgs.stockholm.outPath + "/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh";
             env = {
               PATH = makeBinPath [
                 pkgs.coreutils # XXX date, env
@@ -452,7 +452,7 @@ in {
      name = "reaktor2";
      home = stateDir;
     };
-    script = ''. ${pkgs.writeDash "agenda" ''
+    script = ''. ${pkgs.writers.writeDash "agenda" ''
       echo "$Method $Request_URI" >&2
       case "$Method" in
         "GET")
diff --git a/krebs/2configs/repo-sync.nix b/krebs/2configs/repo-sync.nix
index 9f129d81c..ea9f29514 100644
--- a/krebs/2configs/repo-sync.nix
+++ b/krebs/2configs/repo-sync.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 
 let
   konsens-user = {
diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix
index 40d946f7d..af83a4b0c 100644
--- a/krebs/2configs/wiki.nix
+++ b/krebs/2configs/wiki.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
+{ config, lib, pkgs, ... }:
+with pkgs.stockholm.lib;
 let
 
   setupGit = ''
@@ -14,13 +14,13 @@ let
     fi
   '';
 
-  pushGollum = pkgs.writeDash "push_gollum" ''
+  pushGollum = pkgs.writers.writeDash "push_gollum" ''
     ${setupGit}
     git fetch origin
     git merge --ff-only origin/master
   '';
 
-  pushCgit = pkgs.writeDash "push_cgit" ''
+  pushCgit = pkgs.writers.writeDash "push_cgit" ''
     ${setupGit}
     git push origin master
   '';
diff --git a/krebs/3modules/airdcpp.nix b/krebs/3modules/airdcpp.nix
index 259f613cc..ba6c7de37 100644
--- a/krebs/3modules/airdcpp.nix
+++ b/krebs/3modules/airdcpp.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }:
-with import <stockholm/lib>; #genid
+with lib; #genid
 let
   cfg = config.krebs.airdcpp;
 
@@ -265,14 +265,14 @@ let
     };
     users = lib.mkIf (cfg.user == "airdcpp") {
       users.airdcpp = {
-        uid = genid "airdcpp";
+        uid = pkgs.stockholm.lib.genid "airdcpp";
         home = cfg.stateDir;
         createHome = true;
         isSystemUser = true;
         group = "airdcpp";
         inherit (cfg) extraGroups;
       };
-      groups.airdcpp.gid = genid "airdcpp";
+      groups.airdcpp.gid = pkgs.stockholm.lib.genid "airdcpp";
     };
   };
 in
diff --git a/krebs/3modules/announce-activation.nix b/krebs/3modules/announce-activation.nix
index a40ae8cef..438ef1c0f 100644
--- a/krebs/3modules/announce-activation.nix
+++ b/krebs/3modules/announce-activation.nix
@@ -1,20 +1,20 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }: let
+{ config, pkgs, lib, stockholm, ... }:
+let
   cfg = config.krebs.announce-activation;
   announce-activation = pkgs.writeDash "announce-activation" ''
     set -efu
     message=$(${cfg.get-message})
     exec ${pkgs.irc-announce}/bin/irc-announce \
-        ${shell.escape cfg.irc.server} \
-        ${shell.escape (toString cfg.irc.port)} \
-        ${shell.escape cfg.irc.nick} \
-        ${shell.escape cfg.irc.channel} \
-        ${escapeShellArg cfg.irc.tls} \
+        ${pkgs.stockholm.lib.shell.escape cfg.irc.server} \
+        ${pkgs.stockholm.lib.shell.escape (toString cfg.irc.port)} \
+        ${pkgs.stockholm.lib.shell.escape cfg.irc.nick} \
+        ${pkgs.stockholm.lib.shell.escape cfg.irc.channel} \
+        ${lib.escapeShellArg cfg.irc.tls} \
         "$message"
   '';
   default-get-message = pkgs.writeDash "announce-activation-get-message" ''
     set -efu
-    PATH=${makeBinPath [
+    PATH=${lib.makeBinPath [
       pkgs.coreutils
       pkgs.gawk
       pkgs.gnused
@@ -28,37 +28,37 @@ with import <stockholm/lib>;
   '';
 in {
   options.krebs.announce-activation = {
-    enable = mkEnableOption "announce-activation";
-    get-message = mkOption {
+    enable = lib.mkEnableOption "announce-activation";
+    get-message = lib.mkOption {
       default = default-get-message;
-      type = types.package;
+      type = lib.types.package;
     };
     irc = {
       # TODO rename channel to target?
-      channel = mkOption {
+      channel = lib.mkOption {
         default = "#xxx";
-        type = types.str; # TODO types.irc-channel
+        type = lib.types.str; # TODO types.irc-channel
       };
-      nick = mkOption {
+      nick = lib.mkOption {
         default = config.krebs.build.host.name;
-        type = types.label;
+        type = pkgs.stockholm.lib.types.label;
       };
-      port = mkOption {
+      port = lib.mkOption {
         default = 6667;
-        type = types.int;
+        type = lib.types.int;
       };
-      server = mkOption {
+      server = lib.mkOption {
         default = "irc.r";
-        type = types.hostname;
+        type = pkgs.stockholm.lib.types.hostname;
       };
-      tls = mkOption {
+      tls = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
       };
     };
   };
-  config = mkIf cfg.enable {
-    system.activationScripts.announce-activation = stringAfter [ "etc" ] ''
+  config = lib.mkIf cfg.enable {
+    system.activationScripts.announce-activation = lib.stringAfter [ "etc" ] ''
       ${announce-activation}
     '';
   };
diff --git a/krebs/3modules/apt-cacher-ng.nix b/krebs/3modules/apt-cacher-ng.nix
index f3c8ff0cd..0efe9ed43 100644
--- a/krebs/3modules/apt-cacher-ng.nix
+++ b/krebs/3modules/apt-cacher-ng.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with import <stockholm/lib>;
+with lib;
 let
   acng-config = pkgs.writeTextFile {
     name = "acng-configuration";
diff --git a/krebs/3modules/backup.nix b/krebs/3modules/backup.nix
index c1d4d7211..33ba3a6a6 100644
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@@ -1,5 +1,5 @@
 { config, lib, pkgs, ... }:
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 let
   out = {
     options.krebs.backup = api;
diff --git a/krebs/3modules/bepasty-server.nix b/krebs/3modules/bepasty-server.nix
index c374aa9af..33c825a80 100644
--- a/krebs/3modules/bepasty-server.nix
+++ b/krebs/3modules/bepasty-server.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with lib;
 let
   gunicorn = pkgs.python3Packages.gunicorn;
   bepasty = pkgs.bepasty;
diff --git a/krebs/3modules/bindfs.nix b/krebs/3modules/bindfs.nix
index 7e3730e86..60736710f 100644
--- a/krebs/3modules/bindfs.nix
+++ b/krebs/3modules/bindfs.nix
@@ -1,5 +1,5 @@
-with import <stockholm/lib>;
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
+with lib;
 let
   cfg = config.krebs.bindfs;
 in {
diff --git a/krebs/3modules/brockman.nix b/krebs/3modules/brockman.nix
index 8427ca50b..e010800e5 100644
--- a/krebs/3modules/brockman.nix
+++ b/krebs/3modules/brockman.nix
@@ -1,5 +1,5 @@
-{ pkgs, config, ... }:
-with import <stockholm/lib>;
+{ pkgs, config, lib, ... }:
+with lib;
 let
   cfg = config.krebs.brockman;
 in {
diff --git a/krebs/3modules/build.nix b/krebs/3modules/build.nix
index 5f961617f..2e77e3117 100644
--- a/krebs/3modules/build.nix
+++ b/krebs/3modules/build.nix
@@ -1,6 +1,6 @@
-{ config, ... }:
+{ config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 
 {
   options.krebs.build = {
diff --git a/krebs/3modules/ci/default.nix b/krebs/3modules/ci/default.nix
index 022da5884..84c0255eb 100644
--- a/krebs/3modules/ci/default.nix
+++ b/krebs/3modules/ci/default.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
-
-with import <stockholm/lib>;
+with pkgs.stockholm.lib;
 
 let
   cfg = config.krebs.ci;
@@ -25,7 +24,7 @@ let
   };
 
   hostname = config.networking.hostName;
-  getJobs = pkgs.writeDash "get_jobs" ''
+  getJobs = pkgs.writers.writeDash "get_jobs" ''
     set -efu
     ${pkgs.nix}/bin/nix-build --no-out-link --quiet --show-trace -Q ./ci.nix >&2
     json="$(${pkgs.nix}/bin/nix-instantiate --quiet -Q --eval --strict --json ./ci.nix)"
@@ -116,7 +115,7 @@ let
                             build_script = stages[stage],
                           ),
                           timeout = 3600,
-                          command="${pkgs.writeDash "build.sh" ''
+                          command="${pkgs.writers.writeDash "build.sh" ''
                             set -xefu
                             profile=${shell.escape profileRoot}/$build_name
                             result=$("$build_script")
diff --git a/krebs/3modules/current.nix b/krebs/3modules/current.nix
index e97e53479..5c32203fd 100644
--- a/krebs/3modules/current.nix
+++ b/krebs/3modules/current.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with import <stockholm/lib>;
+with lib;
 
 let
   cfg = config.krebs.current;
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 6d763afed..