Merge remote-tracking branch 'cd/master'

4 files changed, 5 insertions, 5 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;