Merge remote-tracking branch 'cd/master'

46 files changed, 47 insertions, 47 deletions

diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix
index c63dcb492..11bb47a93 100644
--- a/makefu/1systems/darth.nix
+++ b/makefu/1systems/darth.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   byid = dev: "/dev/disk/by-id/" + dev;
   rootDisk = byid "ata-ADATA_SSD_S599_64GB_10460000000000000039";
diff --git a/makefu/1systems/gum.nix b/makefu/1systems/gum.nix
index ebb8e882d..bfd880b88 100644
--- a/makefu/1systems/gum.nix
+++ b/makefu/1systems/gum.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   external-ip = config.krebs.build.host.nets.internet.ip4.addr;
   internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
@@ -40,7 +40,7 @@ in {
     '';
     connectTo = [
       "muhbaasu" "tahoe" "flap" "wry"
-      "ire" "cd" "mkdir" "rmdir"
+      "cd"
       "fastpoke" "prism" "dishfire" "echelon" "cloudkrebs"
     ];
   };
diff --git a/makefu/1systems/omo.nix b/makefu/1systems/omo.nix
index 2e09e345e..4fbbd653d 100644
--- a/makefu/1systems/omo.nix
+++ b/makefu/1systems/omo.nix
@@ -66,7 +66,7 @@ in {
     '';
   };
   users.groups.share = {
-    gid = config.krebs.lib.genid "share";
+    gid = (import <stockholm/lib>).genid "share";
     members = [ "makefu" "misa" ];
   };
   networking.firewall.trustedInterfaces = [ primaryInterface ];
diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 238b740a6..17e81f793 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
 
   external-ip = config.krebs.build.host.nets.internet.ip4.addr;
diff --git a/makefu/2configs/backup.nix b/makefu/2configs/backup.nix
index 57fd7a64d..38fd93e2b 100644
--- a/makefu/2configs/backup.nix
+++ b/makefu/2configs/backup.nix
@@ -1,5 +1,5 @@
 { config, lib, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   # preparation:
   # mkdir -p defaultBackupDir/host.name/src
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index cbc3efbac..95ebabc44 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -11,7 +11,7 @@
 # if this is not enough, check out main-laptop.nix
 
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   mainUser = config.krebs.build.user.name;
 in
diff --git a/makefu/2configs/bepasty-dual.nix b/makefu/2configs/bepasty-dual.nix
index 4b5389c32..a6be04876 100644
--- a/makefu/2configs/bepasty-dual.nix
+++ b/makefu/2configs/bepasty-dual.nix
@@ -10,7 +10,7 @@
 #   wildcard.krebsco.de.key
 #   bepasty-secret.nix     <- contains single string
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   sec = toString <secrets>;
   # secKey is nothing worth protecting on a local machine
diff --git a/makefu/2configs/collectd/collectd-base.nix b/makefu/2configs/collectd/collectd-base.nix
index c739368ca..91e5216ad 100644
--- a/makefu/2configs/collectd/collectd-base.nix
+++ b/makefu/2configs/collectd/collectd-base.nix
@@ -2,7 +2,7 @@
 
 # graphite-web on port 8080
 # carbon cache on port 2003 (tcp/udp)
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   connect-time-cfg = with pkgs; writeText "collectd-connect-time.cfg" ''
     LoadPlugin python
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index f218a350d..cb6fe55b8 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   imports = [
     {
diff --git a/makefu/2configs/deployment/mycube.connector.one.nix b/makefu/2configs/deployment/mycube.connector.one.nix
index daadad05d..091b7f21b 100644
--- a/makefu/2configs/deployment/mycube.connector.one.nix
+++ b/makefu/2configs/deployment/mycube.connector.one.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 # more than just nginx config but not enough to become a module
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   hostname = config.krebs.build.host.name;
   external-ip = config.krebs.build.host.nets.internet.ip4.addr;
diff --git a/makefu/2configs/elchos/stats.nix b/makefu/2configs/elchos/stats.nix
index 0282b04cf..9f27b6647 100644
--- a/makefu/2configs/elchos/stats.nix
+++ b/makefu/2configs/elchos/stats.nix
@@ -2,7 +2,7 @@
 
 # graphite-web on port 8080
 # carbon cache on port 2003 (tcp/udp)
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   sec = toString <secrets>;
   acmepath = "/var/lib/acme/";
diff --git a/makefu/2configs/exim-retiolum.nix b/makefu/2configs/exim-retiolum.nix
index 910066e0a..f15a0cf74 100644
--- a/makefu/2configs/exim-retiolum.nix
+++ b/makefu/2configs/exim-retiolum.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   networking.firewall.allowedTCPPorts = [ 25 ];
 
diff --git a/makefu/2configs/filepimp-share.nix b/makefu/2configs/filepimp-share.nix
index 23fa8da08..70c0320a1 100644
--- a/makefu/2configs/filepimp-share.nix
+++ b/makefu/2configs/filepimp-share.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   hostname = config.krebs.build.host.name;
 in {
diff --git a/makefu/2configs/fs/cac-boot-partition.nix b/makefu/2configs/fs/cac-boot-partition.nix
index bf08504d5..3d59a25dd 100644
--- a/makefu/2configs/fs/cac-boot-partition.nix
+++ b/makefu/2configs/fs/cac-boot-partition.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 # vda1 ext4 (label nixos) -> only root partition
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
diff --git a/makefu/2configs/fs/sda-crypto-root-home.nix b/makefu/2configs/fs/sda-crypto-root-home.nix
index 1ef0d69e9..e790ed6a8 100644
--- a/makefu/2configs/fs/sda-crypto-root-home.nix
+++ b/makefu/2configs/fs/sda-crypto-root-home.nix
@@ -8,7 +8,7 @@
 #             /     (main-root)
 #             /home (main-home)
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
 
   imports = [
diff --git a/makefu/2configs/fs/sda-crypto-root.nix b/makefu/2configs/fs/sda-crypto-root.nix
index 5c7cdf716..cfa703aaf 100644
--- a/makefu/2configs/fs/sda-crypto-root.nix
+++ b/makefu/2configs/fs/sda-crypto-root.nix
@@ -4,7 +4,7 @@
 # sda1: boot ext4 (label nixboot) - must be unlocked on boot if required:
   # boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
 # sda2: cryptoluks -> ext4
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   boot = {
     loader.grub.enable = true;
diff --git a/makefu/2configs/fs/vm-single-partition.nix b/makefu/2configs/fs/vm-single-partition.nix
index 88f209597..26908c357 100644
--- a/makefu/2configs/fs/vm-single-partition.nix
+++ b/makefu/2configs/fs/vm-single-partition.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 # vda1 ext4 (label nixos) -> only root partition
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   imports = [
     ./single-partition-ext4.nix
diff --git a/makefu/2configs/git/brain-retiolum.nix b/makefu/2configs/git/brain-retiolum.nix
index ae54c6dbf..81305272c 100644
--- a/makefu/2configs/git/brain-retiolum.nix
+++ b/makefu/2configs/git/brain-retiolum.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 # TODO: remove tv lib :)
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
 
   repos = priv-repos // krebs-repos ;
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index fe2c850f7..5c2a0fbd0 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 # TODO: remove tv lib :)
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
 
   repos = priv-repos // krebs-repos // connector-repos ;
diff --git a/makefu/2configs/graphite-standalone.nix b/makefu/2configs/graphite-standalone.nix
index dd5438e8d..15ae6b68f 100644
--- a/makefu/2configs/graphite-standalone.nix
+++ b/makefu/2configs/graphite-standalone.nix
@@ -2,7 +2,7 @@
 
 # graphite-web on port 8080
 # carbon cache on port 2003 (tcp/udp)
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   imports = [ ];
 
diff --git a/makefu/2configs/hw/tp-x200.nix b/makefu/2configs/hw/tp-x200.nix
index f17ac74a6..f06425aec 100644
--- a/makefu/2configs/hw/tp-x200.nix
+++ b/makefu/2configs/hw/tp-x200.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
 
   imports = [ ./tp-x2x0.nix ];
diff --git a/makefu/2configs/hw/tp-x220.nix b/makefu/2configs/hw/tp-x220.nix
index 2ec531e56..ce3e34ad3 100644
--- a/makefu/2configs/hw/tp-x220.nix
+++ b/makefu/2configs/hw/tp-x220.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
 
   imports = [ ./tp-x2x0.nix ];
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix
index 368465a8b..2b615ecfa 100644
--- a/makefu/2configs/hw/tp-x2x0.nix
+++ b/makefu/2configs/hw/tp-x2x0.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   networking.wireless.enable = lib.mkDefault true;
 
diff --git a/makefu/2configs/mail-client.nix b/makefu/2configs/mail-client.nix
index eeade94e8..8319b89ce 100644
--- a/makefu/2configs/mail-client.nix
+++ b/makefu/2configs/mail-client.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   environment.systemPackages = with pkgs; [
     abook
diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
index 9d5b06f70..ef8a3b88f 100644
--- a/makefu/2configs/main-laptop.nix
+++ b/makefu/2configs/main-laptop.nix
@@ -5,7 +5,7 @@
 # not fit into base-gui
 # TODO split generic desktop stuff and laptop-specifics like lidswitching
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   window-manager = "awesome";
   user = config.krebs.build.user.name;
diff --git a/makefu/2configs/mattermost-docker.nix b/makefu/2configs/mattermost-docker.nix
index e679a3d91..a887a6a8f 100644
--- a/makefu/2configs/mattermost-docker.nix
+++ b/makefu/2configs/mattermost-docker.nix
@@ -1,6 +1,6 @@
 {config, lib, ...}:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   sec = toString <secrets>;
   ssl_cert = "${sec}/wildcard.krebsco.de.crt";
diff --git a/makefu/2configs/nginx/euer.blog.nix b/makefu/2configs/nginx/euer.blog.nix
index 137c0b0e3..b2a965de6 100644
--- a/makefu/2configs/nginx/euer.blog.nix
+++ b/makefu/2configs/nginx/euer.blog.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   sec = toString <secrets>;
   ssl_cert = "${sec}/wildcard.krebsco.de.crt";
diff --git a/makefu/2configs/nginx/euer.test.nix b/makefu/2configs/nginx/euer.test.nix
index 84b9bacda..bff652daf 100644
--- a/makefu/2configs/nginx/euer.test.nix
+++ b/makefu/2configs/nginx/euer.test.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   hostname = config.krebs.build.host.name;
   user = config.services.nginx.user;
diff --git a/makefu/2configs/nginx/euer.wiki.nix b/makefu/2configs/nginx/euer.wiki.nix
index 655dee7b2..22cf9c9b7 100644
--- a/makefu/2configs/nginx/euer.wiki.nix
+++ b/makefu/2configs/nginx/euer.wiki.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   sec = toString <secrets>;
   ext-dom = "wiki.euer.krebsco.de";
diff --git a/makefu/2configs/nginx/icecult.nix b/makefu/2configs/nginx/icecult.nix
index a11f92af7..ce4f62e55 100644
--- a/makefu/2configs/nginx/icecult.nix
+++ b/makefu/2configs/nginx/icecult.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   icecult = pkgs.fetchFromGitHub {
diff --git a/makefu/2configs/nginx/public_html.nix b/makefu/2configs/nginx/public_html.nix
index 9df8351ca..9545e98f4 100644
--- a/makefu/2configs/nginx/public_html.nix
+++ b/makefu/2configs/nginx/public_html.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 {
   krebs.nginx = {
diff --git a/makefu/2configs/nginx/update.connector.one.nix b/makefu/2configs/nginx/update.connector.one.nix
index dde3e3a64..593f23199 100644
--- a/makefu/2configs/nginx/update.connector.one.nix
+++ b/makefu/2configs/nginx/update.connector.one.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   hostname = config.krebs.build.host.name;
   external-ip = config.krebs.build.host.nets.internet.ip4.addr;
diff --git a/makefu/2configs/omo-share.nix b/makefu/2configs/omo-share.nix
index 86f768662..f2ed42230 100644
--- a/makefu/2configs/omo-share.nix
+++ b/makefu/2configs/omo-share.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   hostname = config.krebs.build.host.name;
   # TODO local-ip from the nets config
diff --git a/makefu/2configs/sabnzbd.nix b/makefu/2configs/sabnzbd.nix
index 6b0f2ac3a..90a9f284f 100644
--- a/makefu/2configs/sabnzbd.nix
+++ b/makefu/2configs/sabnzbd.nix
@@ -1,6 +1,6 @@
 { pkgs, config, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   web-port = 8080;
 in {
diff --git a/makefu/2configs/solr.nix b/makefu/2configs/solr.nix
index cad9eabc1..6fc02df1f 100644
--- a/makefu/2configs/solr.nix
+++ b/makefu/2configs/solr.nix
@@ -2,7 +2,7 @@
 
 # graphite-web on port 8080
 # carbon cache on port 2003 (tcp/udp)
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   solrHome = "/var/db/solr";
 in {
diff --git a/makefu/2configs/torrent.nix b/makefu/2configs/torrent.nix
index 28f21b659..5b9ce6178 100644
--- a/makefu/2configs/torrent.nix
+++ b/makefu/2configs/torrent.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   daemon-user = "tor";
diff --git a/makefu/2configs/zsh-user.nix b/makefu/2configs/zsh-user.nix
index a3286b7fd..f3cdbfda4 100644
--- a/makefu/2configs/zsh-user.nix
+++ b/makefu/2configs/zsh-user.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 ##
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   mainUser = config.krebs.build.user.name;
 in
diff --git a/makefu/3modules/awesome-extra.nix b/makefu/3modules/awesome-extra.nix
index b12556486..81c42cba7 100644
--- a/makefu/3modules/awesome-extra.nix
+++ b/makefu/3modules/awesome-extra.nix
@@ -1,6 +1,6 @@
 {config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   cfg = config.makefu.awesome;
   out = {
diff --git a/makefu/3modules/deluge.nix b/makefu/3modules/deluge.nix
index e81f96f85..bbdd18454 100644
--- a/makefu/3modules/deluge.nix
+++ b/makefu/3modules/deluge.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 # based on <nixpkgs>/nixos/modules/services/torrent/deluge.nix
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   cfg_daemon = config.makefu.deluge;
diff --git a/makefu/3modules/forward-journal.nix b/makefu/3modules/forward-journal.nix
index 26de3ffdd..f501048be 100644
--- a/makefu/3modules/forward-journal.nix
+++ b/makefu/3modules/forward-journal.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   cfg = config.makefu.forward-journal;
 
diff --git a/makefu/3modules/opentracker.nix b/makefu/3modules/opentracker.nix
index 8847fc09a..202231fa1 100644
--- a/