summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2016-10-20 20:54:38 +0200
committertv <tv@krebsco.de>2016-10-20 20:54:38 +0200
commitf47bab7f710b7c8a282c3a3c38affc8a0bc30cc9 (patch)
treea7f59f4511ced29de7bdb4334d84b2f9cd137838 /tv
parent4a6fbbbe503e32096a30a07c3ee51d3524057b8e (diff)
drop config.krebs.lib
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/alnus.nix2
-rw-r--r--tv/1systems/caxi.nix2
-rw-r--r--tv/1systems/cd.nix2
-rw-r--r--tv/1systems/mu.nix2
-rw-r--r--tv/1systems/nomic.nix2
-rw-r--r--tv/1systems/wu.nix2
-rw-r--r--tv/1systems/xu.nix2
-rw-r--r--tv/1systems/zu.nix2
-rw-r--r--tv/2configs/backup.nix2
-rw-r--r--tv/2configs/bash.nix2
-rw-r--r--tv/2configs/default.nix2
-rw-r--r--tv/2configs/exim-retiolum.nix2
-rw-r--r--tv/2configs/exim-smarthost.nix2
-rw-r--r--tv/2configs/git.nix2
-rw-r--r--tv/2configs/hw/AO753.nix2
-rw-r--r--tv/2configs/im.nix2
-rw-r--r--tv/2configs/nginx/default.nix2
-rw-r--r--tv/2configs/nginx/public_html.nix2
-rw-r--r--tv/2configs/pulse.nix2
-rw-r--r--tv/2configs/retiolum.nix2
-rw-r--r--tv/2configs/ssh.nix2
-rw-r--r--tv/2configs/sshd.nix2
-rw-r--r--tv/2configs/urlwatch.nix2
-rw-r--r--tv/2configs/vim.nix2
-rw-r--r--tv/2configs/wu-binary-cache/default.nix2
-rw-r--r--tv/2configs/xdg.nix2
-rw-r--r--tv/2configs/xserver/Xmodmap.nix2
-rw-r--r--tv/2configs/xserver/Xresources.nix2
-rw-r--r--tv/2configs/xserver/default.nix2
-rw-r--r--tv/2configs/xserver/xserver.conf.nix2
-rw-r--r--tv/2configs/xu-qemu0.nix2
-rw-r--r--tv/3modules/charybdis/config.nix2
-rw-r--r--tv/3modules/charybdis/default.nix2
-rw-r--r--tv/3modules/ejabberd/config.nix2
-rw-r--r--tv/3modules/ejabberd/default.nix2
-rw-r--r--tv/3modules/hosts.nix2
-rw-r--r--tv/3modules/iptables.nix2
-rw-r--r--tv/5pkgs/default.nix2
38 files changed, 38 insertions, 38 deletions
diff --git a/tv/1systems/alnus.nix b/tv/1systems/alnus.nix
index d3de8bdf..bc6e3a6d 100644
--- a/tv/1systems/alnus.nix
+++ b/tv/1systems/alnus.nix
@@ -1,6 +1,6 @@
{ config, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
imports = [
diff --git a/tv/1systems/caxi.nix b/tv/1systems/caxi.nix
index 5bfacd99..59f3cd63 100644
--- a/tv/1systems/caxi.nix
+++ b/tv/1systems/caxi.nix
@@ -1,6 +1,6 @@
{ config, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.build.host = config.krebs.hosts.caxi;
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 2ad4a150..043e9151 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.build.host = config.krebs.hosts.cd;
diff --git a/tv/1systems/mu.nix b/tv/1systems/mu.nix
index 55f18326..e9a8a131 100644
--- a/tv/1systems/mu.nix
+++ b/tv/1systems/mu.nix
@@ -1,6 +1,6 @@
{ config, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
imports = [
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 5415e50b..793e1f80 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.build.host = config.krebs.hosts.nomic;
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index c2a624a9..19db559f 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.build.host = config.krebs.hosts.wu;
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 85ac23e9..a84da38d 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.build.host = config.krebs.hosts.xu;
diff --git a/tv/1systems/zu.nix b/tv/1systems/zu.nix
index 0503021d..056652e4 100644
--- a/tv/1systems/zu.nix
+++ b/tv/1systems/zu.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.build.host = config.krebs.hosts.zu;
diff --git a/tv/2configs/backup.nix b/tv/2configs/backup.nix
index e74ed79d..6dd24b32 100644
--- a/tv/2configs/backup.nix
+++ b/tv/2configs/backup.nix
@@ -1,5 +1,5 @@
{ config, lib, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.backup.plans = {
} // mapAttrs (_: recursiveUpdate {
diff --git a/tv/2configs/bash.nix b/tv/2configs/bash.nix
index fe87aa8d..40c0725e 100644
--- a/tv/2configs/bash.nix
+++ b/tv/2configs/bash.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
programs.bash = {
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index abc657ec..32e4b450 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.enable = true;
diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix
index ad355f8b..bf13a388 100644
--- a/tv/2configs/exim-retiolum.nix
+++ b/tv/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/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index 591edafb..cc3bdf95 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/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/tv/2configs/git.nix b/tv/2configs/git.nix
index fd387541..21d36538 100644
--- a/tv/2configs/git.nix
+++ b/tv/2configs/git.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
let
diff --git a/tv/2configs/hw/AO753.nix b/tv/2configs/hw/AO753.nix
index b81b773b..8625078d 100644
--- a/tv/2configs/hw/AO753.nix
+++ b/tv/2configs/hw/AO753.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
imports = [
diff --git a/tv/2configs/im.nix b/tv/2configs/im.nix
index db1be7f0..82f1be04 100644
--- a/tv/2configs/im.nix
+++ b/tv/2configs/im.nix
@@ -1,5 +1,5 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
environment.systemPackages = with pkgs; [
(pkgs.writeDashBin "im" ''
diff --git a/tv/2configs/nginx/default.nix b/tv/2configs/nginx/default.nix
index d0d07d5c..39995c05 100644
--- a/tv/2configs/nginx/default.nix
+++ b/tv/2configs/nginx/default.nix
@@ -1,6 +1,6 @@
{ config, lib, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.nginx = {
diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index 858f1656..e0bbb8d5 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -1,6 +1,6 @@
{ config, lib, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.nginx = {
diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix
index 51291975..9c40e9b6 100644
--- a/tv/2configs/pulse.nix
+++ b/tv/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/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix
index 7179be57..0abc9682 100644
--- a/tv/2configs/retiolum.nix
+++ b/tv/2configs/retiolum.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.tinc.retiolum = {
diff --git a/tv/2configs/ssh.nix b/tv/2configs/ssh.nix
index 7bf58342..84d24736 100644
--- a/tv/2configs/ssh.nix
+++ b/tv/2configs/ssh.nix
@@ -1,6 +1,6 @@
{ config, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
# Override NixOS's "Allow DSA keys for now."
diff --git a/tv/2configs/sshd.nix b/tv/2configs/sshd.nix
index 943f32fe..1749b552 100644
--- a/tv/2configs/sshd.nix
+++ b/tv/2configs/sshd.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
services.openssh = {
diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix
index 89937d70..b3459090 100644
--- a/tv/2configs/urlwatch.nix
+++ b/tv/2configs/urlwatch.nix
@@ -1,5 +1,5 @@
{ config, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
krebs.urlwatch = {
enable = true;
diff --git a/tv/2configs/vim.nix b/tv/2configs/vim.nix
index 16f54048..cc59a95a 100644
--- a/tv/2configs/vim.nix
+++ b/tv/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/tv/2configs/wu-binary-cache/default.nix b/tv/2configs/wu-binary-cache/default.nix
index 6fcac21a..f039a552 100644
--- a/tv/2configs/wu-binary-cache/default.nix
+++ b/tv/2configs/wu-binary-cache/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }: with config.krebs.lib;
+{ config, lib, pkgs, ... }: with import <stockholm/lib>;
{
services.nix-serve = assert config.krebs.build.host.name == "wu"; {
enable = true;
diff --git a/tv/2configs/xdg.nix b/tv/2configs/xdg.nix
index f05ec543..18bac9b3 100644
--- a/tv/2configs/xdg.nix
+++ b/tv/2configs/xdg.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
environment.variables.XDG_RUNTIME_DIR = "/run/xdg/$LOGNAME";
diff --git a/tv/2configs/xserver/Xmodmap.nix b/tv/2configs/xserver/Xmodmap.nix
index 02b6c730..d2b1b260 100644
--- a/tv/2configs/xserver/Xmodmap.nix
+++ b/tv/2configs/xserver/Xmodmap.nix
@@ -1,6 +1,6 @@
{ config, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
pkgs.writeText "Xmodmap" ''
!keycode 66 = Caps_Lock
diff --git a/tv/2configs/xserver/Xresources.nix b/tv/2configs/xserver/Xresources.nix
index ad41f3a9..398247d2 100644
--- a/tv/2configs/xserver/Xresources.nix
+++ b/tv/2configs/xserver/Xresources.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
pkgs.writeText "Xresources" /* xdefaults */ ''
!URxvt*background: #050505
diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix
index 7a76530b..7dcfecce 100644
--- a/tv/2configs/xserver/default.nix
+++ b/tv/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/tv/2configs/xserver/xserver.conf.nix b/tv/2configs/xserver/xserver.conf.nix
index c452b422..6f34e015 100644
--- a/tv/2configs/xserver/xserver.conf.nix
+++ b/tv/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/tv/2configs/xu-qemu0.nix b/tv/2configs/xu-qemu0.nix
index 0e4a91c9..355a3665 100644
--- a/tv/2configs/xu-qemu0.nix
+++ b/tv/2configs/xu-qemu0.nix
@@ -15,7 +15,7 @@ in
#
# make [install] system=xu-qemu0 target_host=10.56.0.101
-with config.krebs.lib;
+with import <stockholm/lib>;
{
networking.dhcpcd.denyInterfaces = [ "qemubr0" ];
diff --git a/tv/3modules/charybdis/config.nix b/tv/3modules/charybdis/config.nix
index 1b160926..5812516f 100644
--- a/tv/3modules/charybdis/config.nix
+++ b/tv/3modules/charybdis/config.nix
@@ -1,4 +1,4 @@
-{ config, ... }: with config.krebs.lib; let
+{ config, ... }: with import <stockholm/lib>; let
cfg = config.tv.charybdis;
in toFile "charybdis.conf" ''
/* doc/example.conf - brief example configuration file
diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix
index 3af971cd..859dc122 100644
--- a/tv/3modules/charybdis/default.nix
+++ b/tv/3modules/charybdis/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.tv.charybdis;
in {
options.tv.charybdis = {
diff --git a/tv/3modules/ejabberd/config.nix b/tv/3modules/ejabberd/config.nix
index 49bded85..29c38fbe 100644
--- a/tv/3modules/ejabberd/config.nix
+++ b/tv/3modules/ejabberd/config.nix
@@ -1,4 +1,4 @@
-{ config, ... }: with config.krebs.lib; let
+{ config, ... }: with import <stockholm/lib>; let
cfg = config.tv.ejabberd;
# XXX this is a placeholder that happens to work the default strings.
diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix
index 95ea24be..4d3493d7 100644
--- a/tv/3modules/ejabberd/default.nix
+++ b/tv/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.tv.ejabberd;
in {
options.tv.ejabberd = {
diff --git a/tv/3modules/hosts.nix b/tv/3modules/hosts.nix
index 7bf3267c..11874051 100644
--- a/tv/3modules/hosts.nix
+++ b/tv/3modules/hosts.nix
@@ -1,6 +1,6 @@
{ config, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
options.tv.hosts = mkOption {
diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix
index 4b1d1ef8..7276726c 100644
--- a/tv/3modules/iptables.nix
+++ b/tv/3modules/iptables.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
let
cfg = config.tv.iptables;
diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix
index 3590ad57..ace3ed00 100644
--- a/tv/5pkgs/default.nix
+++ b/tv/5pkgs/default.nix
@@ -1,5 +1,5 @@
{ config, pkgs, ... }:
-with config.krebs.lib;
+with import <stockholm/lib>;
{
nixpkgs.config.packageOverrides = super: {
# TODO use XDG_RUNTIME_DIR?