From f430671a1b5fbbf10771d8b4066ef9213d87c746 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 6 Jun 2017 14:03:24 +0200 Subject: s 1 wolf: enable radioactive --- shared/1systems/wolf.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'shared/1systems') 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 ../. ../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/" ]; -- cgit v1.3.1 From 5cb26223e2f5c361fa68a8b6d50575c06942e471 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 18 Jun 2017 14:09:02 +0200 Subject: s 1 wolf: bump worlddomination --- shared/1systems/wolf.nix | 10 ++++++++++ shared/2configs/shack/worlddomination.nix | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'shared/1systems') diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index f50fc80..584ee03 100644 --- a/shared/1systems/wolf.nix +++ b/shared/1systems/wolf.nix @@ -15,6 +15,7 @@ in ../2configs/repo-sync.nix ../2configs/shared-buildbot.nix + ../2configs/shack/worlddomination.nix ../2configs/shack/drivedroid.nix # ../2configs/shack/nix-cacher.nix ../2configs/shack/mqtt_sub.nix @@ -90,6 +91,15 @@ in swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; + # fallout of ipv6calypse + networking.extraHosts = '' + hass.shack 10.42.2.191 + heidi.shack 10.42.2.135 + ''; + + users.extraUsers.root.openssh.authorizedKeys.keys = [ + config.krebs.users.ulrich.pubkey + ]; time.timeZone = "Europe/Berlin"; sound.enable = false; diff --git a/shared/2configs/shack/worlddomination.nix b/shared/2configs/shack/worlddomination.nix index ee461b5..d0f9f5f 100644 --- a/shared/2configs/shack/worlddomination.nix +++ b/shared/2configs/shack/worlddomination.nix @@ -26,11 +26,11 @@ let }; }; pkg = pkgs.stdenv.mkDerivation { - name = "worlddomination-2017-06-08"; + name = "worlddomination-2017-06-10"; src = pkgs.fetchgit { url = "https://github.com/shackspace/worlddomination/"; - rev = "39344a4"; - sha256 = "07alvdgz1vyww6nlay4qx4l7hnfqw0sqcdd9syhsjhqv3ciigwcp"; + rev = "72fc9b5"; + sha256 = "05h500rswzypcxy4i22qc1vkc8izbzfqa9m86xg289hjxh133xyf"; }; buildInputs = [ (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ -- cgit v1.3.1 [cgit] Unable to lock slot /tmp/cgit/bf000000.lock: No such file or directory (2)