summaryrefslogtreecommitdiffstats
path: root/shared/1systems
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-15 21:13:46 +0200
committerlassulus <lass@lassul.us>2017-06-15 21:13:46 +0200
commitd05329475f80afd7e0a480fbe884309e810f60e5 (patch)
tree025dff6fe84a757287e473f6c985d9fdf7f9c9d6 /shared/1systems
parentf48808dda4911af60bc0cc32c00d6544f6e713b9 (diff)
parent7ffb6f35247d7aea4d918eb4a30990800a017e8f (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/1systems')
-rw-r--r--shared/1systems/wolf.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index 9acc589..f50fc80 100644
--- a/shared/1systems/wolf.nix
+++ b/shared/1systems/wolf.nix
@@ -7,7 +7,6 @@ in
../.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../2configs/collectd-base.nix
- ../2configs/shack/share.nix
../2configs/central-stats-client.nix
../2configs/save-diskspace.nix
@@ -15,11 +14,13 @@ in
../2configs/graphite.nix
../2configs/repo-sync.nix
../2configs/shared-buildbot.nix
- ../2configs/shack/drivedroid.nix
- ../2configs/shack/nix-cacher.nix
+ ../2configs/shack/drivedroid.nix
+ # ../2configs/shack/nix-cacher.nix
../2configs/shack/mqtt_sub.nix
../2configs/shack/muell_caller.nix
+ ../2configs/shack/radioactive.nix
+ ../2configs/shack/share.nix
];
# use your own binary cache, fallback use cache.nixos.org (which is used by
@@ -42,7 +43,6 @@ in
nix = {
binaryCaches = [
- "http://localhost:3142/nixos"
"http://cache.prism.r"
"https://cache.nixos.org/"
];