Merge remote-tracking branch 'cd/master'

1 files changed, 5 insertions, 7 deletions

diff --git a/krebs/3modules/shared/default.nix b/krebs/3modules/shared/default.nix
index 91d92857b..208b596f8 100644
--- a/krebs/3modules/shared/default.nix
+++ b/krebs/3modules/shared/default.nix
@@ -1,9 +1,8 @@
-{ lib, ... }:
-
-with lib;
+{ config, ... }:
 
+with config.krebs.lib;
 let
-  testHosts = lib.genAttrs [
+  testHosts = genAttrs [
     "test-arch"
     "test-centos6"
     "test-centos7"
@@ -32,9 +31,8 @@ let
     };
   });
 in {
-  hosts = addNames {
+  hosts = {
     wolf = {
-      dc = "shack";
       nets = {
         shack = {
           addrs4 = [ "10.42.2.150" ];
@@ -68,7 +66,7 @@ in {
       ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKYMXMWZIK0jjnZDM9INiYAKcwjXs2241vew54K8veCR";
     };
   } // testHosts;
-  users = addNames {
+  users = {
     shared = {
       mail = "spam@krebsco.de";
       pubkey = "lol"; # TODO krebs.users.shared.pubkey should be unnecessary