summaryrefslogtreecommitdiffstats
path: root/makefu/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-10-24 14:14:58 +0200
committermakefu <github@syntax-fehler.de>2016-10-24 14:14:58 +0200
commit36cbb3d300eb18330a62ba20e35f80d515f5bc5f (patch)
treededf23acdc5763b59b5853b07dd297b88fb15636 /makefu/1systems
parent3fa63a4f312a885d353177db911f8a52ce7a1e1c (diff)
parent08c7671fc51270e582e16cbe49aa896f8bff7685 (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.nix4
-rw-r--r--makefu/1systems/omo.nix2
-rw-r--r--makefu/1systems/wry.nix2
4 files changed, 5 insertions, 5 deletions
diff --git a/makefu/1systems/darth.nix b/makefu/1systems/darth.nix
index c63dcb49..11bb47a9 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 ebb8e882..bfd880b8 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 2e09e345..4fbbd653 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 238b740a..17e81f79 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;