summaryrefslogtreecommitdiffstats
path: root/shared/1systems/wolf.nix
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
commitc6605a3ab8f6a5098bbd3e011de50e37bf242a05 (patch)
tree57a0868c0dbe34aa553c5175c2f3ab29add0a330 /shared/1systems/wolf.nix
parentfde07d4e5ed92309ca1c7570c936ec3d324ca2f3 (diff)
parent70260c70943cfcad80c268920566c1a858870b28 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/1systems/wolf.nix')
-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 9acc5894b..f50fc80c4 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/"
];