Merge remote-tracking branch 'ni/flakify'

19 files changed, 50 insertions, 50 deletions

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/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index f0b6c324d..32452e010 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -1,5 +1,5 @@
-{ config, ... }: with import <stockholm/lib>;
-
+{ config, lib, ... }:
+with import ../../lib/pure.nix { inherit lib; };
 {
   networking.firewall.allowedTCPPorts = [ 80 ];
   services.nginx = {
diff --git a/krebs/2configs/cal.nix b/krebs/2configs/cal.nix
index 15f0027b3..a1fe47b5d 100644
--- a/krebs/2configs/cal.nix
+++ b/krebs/2configs/cal.nix
@@ -1,4 +1,5 @@
 { config, lib, pkgs, ... }: let
+  slib = import ../../lib/pure.nix { inherit lib; };
 
   setupGit = ''
     export PATH=${lib.makeBinPath [
@@ -23,13 +24,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
   '';
@@ -73,7 +74,7 @@ in {
     cgit.settings = {
       root-title = "krebs repos";
     };
-    rules = with pkgs.stockholm.lib.git; [
+    rules = with slib.git; [
       {
         user = [
           {
diff --git a/krebs/2configs/default.nix b/krebs/2configs/default.nix
index eda03cc10..bd4f36cbe 100644
--- a/krebs/2configs/default.nix
+++ b/krebs/2configs/default.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with import ../../lib/pure.nix { inherit lib; };
 {
   imports = [
     ./backup.nix
diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix
index 01597f49f..c2f6b4dc0 100644
--- a/krebs/2configs/exim-smarthost.nix
+++ b/krebs/2configs/exim-smarthost.nix
@@ -1,5 +1,6 @@
-with import <stockholm/lib>;
-{ config, ... }: let
+{ config, lib, ... }:
+with import ../../lib/pure.nix { inherit lib; };
+let
 
   format = from: to: {
     inherit from;
diff --git a/krebs/2configs/go.nix b/krebs/2configs/go.nix
index ce5db62d4..ea3258b9c 100644
--- a/krebs/2configs/go.nix
+++ b/krebs/2configs/go.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
 {
   krebs.go = {
     enable = true;
diff --git a/krebs/2configs/hw/x220.nix b/krebs/2configs/hw/x220.nix
index bb273652d..980c2c9aa 100644
--- a/krebs/2configs/hw/x220.nix
+++ b/krebs/2configs/hw/x220.nix
@@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
 {
   networking.wireless.enable = lib.mkDefault true;
 
diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix
index 45ff61baf..231c3d46c 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 import ../../lib/pure.nix { inherit 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"
       '';
     };
@@ -293,8 +293,7 @@ let
         {
           activate = "always";
           command = {
-            filename =
-              <stockholm/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh>;
+            filename = ../5pkgs/simple/Reaktor/scripts/tell-on_join.sh;
             env = {
               PATH = makeBinPath [
                 pkgs.coreutils # XXX env, touch
@@ -311,7 +310,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 +327,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 +344,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 +373,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
@@ -417,8 +416,7 @@ let
         (generators.command_hook {
           inherit (commands) dance random-emoji nixos-version;
           tell = {
-            filename =
-              <stockholm/krebs/5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh>;
+            filename = ../5pkgs/simple/Reaktor/scripts/tell-on_privmsg.sh;
             env = {
               PATH = makeBinPath [
                 pkgs.coreutils # XXX date, env
@@ -452,7 +450,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..1b72924a6 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 import ../../lib/pure.nix { inherit lib; };
 
 let
   konsens-user = {
diff --git a/krebs/2configs/secret-passwords.nix b/krebs/2configs/secret-passwords.nix
index 5d265eba6..0f0d068aa 100644
--- a/krebs/2configs/secret-passwords.nix
+++ b/krebs/2configs/secret-passwords.nix
@@ -1,4 +1,5 @@
-{ ... }: with import <stockholm/lib>;
+{ lib, ... }:
+with lib;
 {
   users.extraUsers =
     mapAttrs (_: h: { hashedPassword = h; })
diff --git a/krebs/2configs/shack/drivedroid.nix b/krebs/2configs/shack/drivedroid.nix
index 12e4a39c3..e00db8b8d 100644
--- a/krebs/2configs/shack/drivedroid.nix
+++ b/krebs/2configs/shack/drivedroid.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, ... }:
-with import <stockholm/lib>;
+{ config, lib, pkgs, ... }:
+with import ../../../lib/pure.nix { inherit lib; };
 let
   root = "/var/srv/drivedroid";
 in
diff --git a/krebs/2configs/shack/mqtt_sub.nix b/krebs/2configs/shack/mqtt_sub.nix
index af2bc1e66..45065cfc8 100644
--- a/krebs/2configs/shack/mqtt_sub.nix
+++ b/krebs/2configs/shack/mqtt_sub.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with import ../../../lib/pure.nix { inherit lib; };
 let
   pkg = pkgs.stdenv.mkDerivation {
     name = "mqtt2graphite-2017-05-29";
diff --git a/krebs/2configs/shack/muell_caller.nix b/krebs/2configs/shack/muell_caller.nix
index 33f6b8c89..f3007dd1d 100644
--- a/krebs/2configs/shack/muell_caller.nix
+++ b/krebs/2configs/shack/muell_caller.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with import ../../../lib/pure.nix { inherit lib; };
 let
   pkg = pkgs.stdenv.mkDerivation {
     name = "muell_caller-2017-06-01";
diff --git a/krebs/2configs/shack/nix-cacher.nix b/krebs/2configs/shack/nix-cacher.nix
index 8feeca9af..131525a3e 100644
--- a/krebs/2configs/shack/nix-cacher.nix
+++ b/krebs/2configs/shack/nix-cacher.nix
@@ -1,5 +1,5 @@
 { config, pkgs, ... }:
-with import <stockholm/lib>;
+with import ../../../lib/pure.nix { inherit lib; };
 let
   cfg = config.krebs.apt-cacher-ng;
 in
diff --git a/krebs/2configs/shack/radioactive.nix b/krebs/2configs/shack/radioactive.nix
index 286a73aae..e24121038 100644
--- a/krebs/2configs/shack/radioactive.nix
+++ b/krebs/2configs/shack/radioactive.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with import ../../../lib/pure.nix { inherit lib; };
 let
   pkg = pkgs.stdenv.mkDerivation {
     name = "radioactive-2017-06-01";
diff --git a/krebs/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix
index e339d3174..b7a8f18df 100644
--- a/krebs/2configs/shack/worlddomination.nix
+++ b/krebs/2configs/shack/worlddomination.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import <stockholm/lib>;
+with import ../../../lib/pure.nix { inherit lib; };
 let
   pkg = pkgs.stdenv.mkDerivation {
     name = "worlddomination-2020-12-01";
diff --git a/krebs/2configs/stats/shack-debugging.nix b/krebs/2configs/stats/shack-debugging.nix
index b5a0cf05e..79730adad 100644
--- a/krebs/2configs/stats/shack-debugging.nix
+++ b/krebs/2configs/stats/shack-debugging.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 # TODO: krebs.collectd.plugins
-with import <stockholm/lib>;
+with import ../../../lib/pure.nix { inherit lib; };
 let
   connect-time-cfg = with pkgs; writeText "collectd-connect-time.conf" ''
     LoadPlugin python
diff --git a/krebs/2configs/syncthing.nix b/krebs/2configs/syncthing.nix
index d6d42ca11..59178516c 100644
--- a/krebs/2configs/syncthing.nix
+++ b/krebs/2configs/syncthing.nix
@@ -1,4 +1,6 @@
-{ options, config, pkgs, ... }: with import <stockholm/lib>; let
+{ config, lib, options, pkgs, ... }:
+with import ../../lib/pure.nix { inherit lib; };
+let
   mk_peers = mapAttrs (n: v: { id = v.syncthing.id; });
 
   all_peers = filterAttrs (n: v: v.syncthing.id != null) config.krebs.hosts;
diff --git a/krebs/2configs/wiki.nix b/krebs/2configs/wiki.nix
index 40d946f7d..a227ceb4a 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 import ../../lib/pure.nix { inherit 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
   '';