summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-20 21:19:26 +0200
committerlassulus <lass@aidsballs.de>2016-10-20 21:19:26 +0200
commit5cfe3f414097a16dfa84cd52739689e08b7fa0b3 (patch)
tree81ef0820be1d91961f18f2e75e2d9172bf865093 /makefu/1systems
parent51a9fb2dccf6996e1f4fe6f795076ebc6bc71d25 (diff)
parentf47bab7f710b7c8a282c3a3c38affc8a0bc30cc9 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'makefu/1systems')
-rw-r--r--makefu/1systems/darth.nix2
-rw-r--r--makefu/1systems/gum.nix2
-rw-r--r--makefu/1systems/omo.nix2
-rw-r--r--makefu/1systems/wry.nix2
4 files changed, 4 insertions, 4 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 20731c847..178d496f3 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;
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;