drop config.krebs.lib

35 files changed, 36 insertions, 36 deletions

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 8ce1d5748..c16080762 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 with builtins;
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 {
   imports = [
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 1028ca652..ae48761e7 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   imports = [
     ../.
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 8b4f1d7a2..76710ac9d 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   ip = config.krebs.build.host.nets.internet.ip4.addr;
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index e1417c83d..b84fec317 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 with builtins;
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   imports = [
     ../.
diff --git a/lass/2configs/backups.nix b/lass/2configs/backups.nix
index 916e08219..22b48f6e8 100644
--- a/lass/2configs/backups.nix
+++ b/lass/2configs/backups.nix
@@ -1,5 +1,5 @@
 { config, lib, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
 
   krebs.backup.plans = {
diff --git a/lass/2configs/browsers.nix b/lass/2configs/browsers.nix
index 90f420674..88ee70802 100644
--- a/lass/2configs/browsers.nix
+++ b/lass/2configs/browsers.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
 
   mainUser = config.users.extraUsers.mainUser;
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 628fdf61f..df01a84c0 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -1,6 +1,6 @@
 { lib, config, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   sshHostConfig = pkgs.writeText "ssh-config" ''
diff --git a/lass/2configs/c-base.nix b/lass/2configs/c-base.nix
index 9d13bc30d..9295fd9ef 100644
--- a/lass/2configs/c-base.nix
+++ b/lass/2configs/c-base.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  inherit (config.krebs.lib) genid;
+  inherit (import <stockholm/lib>) genid;
 
 in {
 
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index 0b7ca8eaa..43c4d5b0d 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   imports = [
     ../2configs/audit.nix
diff --git a/lass/2configs/downloading.nix b/lass/2configs/downloading.nix
index 1bba5b416..79a609e2b 100644
--- a/lass/2configs/downloading.nix
+++ b/lass/2configs/downloading.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 {
   users.extraUsers = {
diff --git a/lass/2configs/exim-retiolum.nix b/lass/2configs/exim-retiolum.nix
index c07b6c15a..1ee8d843e 100644
--- a/lass/2configs/exim-retiolum.nix
+++ b/lass/2configs/exim-retiolum.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 {
   krebs.exim-retiolum.enable = true;
diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix
index 3ed8be77f..3bf78d9f4 100644
--- a/lass/2configs/exim-smarthost.nix
+++ b/lass/2configs/exim-smarthost.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 {
   krebs.exim-smarthost = {
diff --git a/lass/2configs/gc.nix b/lass/2configs/gc.nix
index 8762ad95e..00f318e51 100644
--- a/lass/2configs/gc.nix
+++ b/lass/2configs/gc.nix
@@ -1,6 +1,6 @@
 { config, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   nix.gc = {
     automatic = ! elem config.krebs.build.host.name [ "prism" "mors" ];
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index ab4450715..06cae734e 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
 
diff --git a/lass/2configs/go.nix b/lass/2configs/go.nix
index 795ad7a26..7d694c173 100644
--- a/lass/2configs/go.nix
+++ b/lass/2configs/go.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   environment.systemPackages = [
     pkgs.go
diff --git a/lass/2configs/hw/tp-x220.nix b/lass/2configs/hw/tp-x220.nix
index be1faccea..4a7d0bbcd 100644
--- a/lass/2configs/hw/tp-x220.nix
+++ b/lass/2configs/hw/tp-x220.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/lass/2configs/libvirt.nix b/lass/2configs/libvirt.nix
index a51ccae58..e739d2f79 100644
--- a/lass/2configs/libvirt.nix
+++ b/lass/2configs/libvirt.nix
@@ -2,7 +2,7 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
-  inherit (config.krebs.lib) genid;
+  inherit (import <stockholm/lib>) genid;
 
 in {
   virtualisation.libvirtd.enable = true;
diff --git a/lass/2configs/pulse.nix b/lass/2configs/pulse.nix
index 3be482191..373207461 100644
--- a/lass/2configs/pulse.nix
+++ b/lass/2configs/pulse.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   pkg = pkgs.pulseaudioLight;
   runDir = "/run/pulse";
diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 59678dbff..88e826683 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -1,11 +1,11 @@
 { config, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   name = "radio";
   mainUser = config.users.extraUsers.mainUser;
-  inherit (config.krebs.lib) genid;
+  inherit (import <stockholm/lib>) genid;
 
   admin-password = import <secrets/icecast-admin-pw>;
   source-password = import <secrets/icecast-source-pw>;
diff --git a/lass/2configs/repo-sync.nix b/lass/2configs/repo-sync.nix
index eae583a84..f88149730 100644
--- a/lass/2configs/repo-sync.nix
+++ b/lass/2configs/repo-sync.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   mirror = "git@${config.networking.hostName}:";
diff --git a/lass/2configs/skype.nix b/lass/2configs/skype.nix
index 5b6da4a95..a803df15b 100644
--- a/lass/2configs/skype.nix
+++ b/lass/2configs/skype.nix
@@ -2,7 +2,7 @@
 
 let
   mainUser = config.users.extraUsers.mainUser;
-  inherit (config.krebs.lib) genid;
+  inherit (import <stockholm/lib>) genid;
 
 in {
   users.extraUsers = {
diff --git a/lass/2configs/teamviewer.nix b/lass/2configs/teamviewer.nix
index 22bfb18d8..87b6fbac3 100644
--- a/lass/2configs/teamviewer.nix
+++ b/lass/2configs/teamviewer.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   services.teamviewer.enable = true;
 }
diff --git a/lass/2configs/vim.nix b/lass/2configs/vim.nix
index 2bbec6ab1..aac2b96d4 100644
--- a/lass/2configs/vim.nix
+++ b/lass/2configs/vim.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   out = {
     environment.systemPackages = [
diff --git a/lass/2configs/weechat.nix b/lass/2configs/weechat.nix
index 0bfd9fe6b..ae07b9a2e 100644
--- a/lass/2configs/weechat.nix
+++ b/lass/2configs/weechat.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  inherit (config.krebs.lib) genid;
+  inherit (import <stockholm/lib>) genid;
 in {
   krebs.per-user.chat.packages = with pkgs; [
     mosh
diff --git a/lass/2configs/xserver/Xresources.nix b/lass/2configs/xserver/Xresources.nix
index 0f04540c3..3049774f8 100644
--- a/lass/2configs/xserver/Xresources.nix
+++ b/lass/2configs/xserver/Xresources.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 pkgs.writeText "Xresources" ''
   URxvt*scrollBar:                      false
diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 0f9b1f84a..53c8f9444 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -1,5 +1,5 @@
 { config, pkgs, ... }@args:
-with config.krebs.lib;
+with import <stockholm/lib>;
 let
   user = config.krebs.build.user;
 in {
diff --git a/lass/2configs/xserver/xserver.conf.nix b/lass/2configs/xserver/xserver.conf.nix
index c452b4226..6f34e0150 100644
--- a/lass/2configs/xserver/xserver.conf.nix
+++ b/lass/2configs/xserver/xserver.conf.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   cfg = config.services.xserver;
diff --git a/lass/3modules/ejabberd/config.nix b/lass/3modules/ejabberd/config.nix
index 83ca5dc2a..b1fca08d3 100644
--- a/lass/3modules/ejabberd/config.nix
+++ b/lass/3modules/ejabberd/config.nix
@@ -1,4 +1,4 @@
-{ config, ... }: with config.krebs.lib; let
+{ config, ... }: with import <stockholm/lib>; let
   cfg = config.lass.ejabberd;
 
   # XXX this is a placeholder that happens to work the default strings.
diff --git a/lass/3modules/ejabberd/default.nix b/lass/3modules/ejabberd/default.nix
index 18c7cd656..e2fba5ff5 100644
--- a/lass/3modules/ejabberd/default.nix
+++ b/lass/3modules/ejabberd/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }@args: with config.krebs.lib; let
+{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
   cfg = config.lass.ejabberd;
 in {
   options.lass.ejabberd = {
diff --git a/lass/3modules/hosts.nix b/lass/3modules/hosts.nix
index f2ff10c06..125819bb0 100644
--- a/lass/3modules/hosts.nix
+++ b/lass/3modules/hosts.nix
@@ -1,6 +1,6 @@
 { config, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 {
   options.lass.hosts = mkOption {
diff --git a/lass/3modules/owncloud_nginx.nix b/lass/3modules/owncloud_nginx.nix
index 4a79311a4..01e07ae66 100644
--- a/lass/3modules/owncloud_nginx.nix
+++ b/lass/3modules/owncloud_nginx.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   cfg = config.lass.owncloud;
diff --git a/lass/3modules/static_nginx.nix b/lass/3modules/static_nginx.nix
index 6b5d19615..cd33a2cf1 100644
--- a/lass/3modules/static_nginx.nix
+++ b/lass/3modules/static_nginx.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   cfg = config.lass.staticPage;
diff --git a/lass/3modules/umts.nix b/lass/3modules/umts.nix
index 7daaba89e..83de4d403 100644
--- a/lass/3modules/umts.nix
+++ b/lass/3modules/umts.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   cfg = config.lass.umts;
diff --git a/lass/3modules/usershadow.nix b/lass/3modules/usershadow.nix
index 0e7e718a4..1ee01e8d9 100644
--- a/lass/3modules/usershadow.nix
+++ b/lass/3modules/usershadow.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }@args: with config.krebs.lib; let
+{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let
 
   cfg = config.lass.usershadow;
 
diff --git a/lass/3modules/wordpress_nginx.nix b/lass/3modules/wordpress_nginx.nix
index 4305a121b..5d88e3fde 100644
--- a/lass/3modules/wordpress_nginx.nix
+++ b/lass/3modules/wordpress_nginx.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   cfg = config.lass.wordpress;