From f47bab7f710b7c8a282c3a3c38affc8a0bc30cc9 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 20 Oct 2016 20:54:38 +0200 Subject: drop config.krebs.lib --- makefu/1systems/darth.nix | 2 +- makefu/1systems/gum.nix | 2 +- makefu/1systems/omo.nix | 2 +- makefu/1systems/wry.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'makefu/1systems') 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 ; 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 ; 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 ).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 ; let external-ip = config.krebs.build.host.nets.internet.ip4.addr; -- cgit v1.2.3