summaryrefslogtreecommitdiffstats
path: root/shared/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-04-17 16:06:27 +0200
committermakefu <github@syntax-fehler.de>2017-04-17 16:06:27 +0200
commitfdefa2b20cfa2037fc866ac68fb53b668bb60a17 (patch)
treefe2ea8d366b5761c2523d7091774a630f0bd74e9 /shared/1systems
parent35c7e1c37545dd96c90d54191ba835eb0ceeac8e (diff)
parent9cb758c1cbabdfc8f186d78d52992510766f934e (diff)
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'shared/1systems')
-rw-r--r--shared/1systems/wolf.nix12
1 files changed, 5 insertions, 7 deletions
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 722a08812..0b4448022 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -1,20 +1,18 @@
-{ config, lib, pkgs, ... }:
-
+{ config, pkgs, ... }:
let
shack-ip = config.krebs.build.host.nets.shack.ip4.addr;
- internal-ip = config.krebs.build.host.nets.retiolum.ip4.addr;
in
{
imports = [
../.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
+ ../2configs/cgit-mirror.nix
../2configs/collectd-base.nix
- ../2configs/shack-nix-cacher.nix
+ ../2configs/graphite.nix
+ ../2configs/repo-sync.nix
../2configs/shack-drivedroid.nix
+ ../2configs/shack-nix-cacher.nix
../2configs/shared-buildbot.nix
- ../2configs/cgit-mirror.nix
- ../2configs/repo-sync.nix
- ../2configs/graphite.nix
../2configs/share-shack.nix
];
# use your own binary cache, fallback use cache.nixos.org (which is used by