From 2cb779a54972197e69aeb53f14a6b3e391844d34 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sun, 18 Jun 2017 14:09:02 +0200
Subject: [PATCH] s 1 wolf: bump worlddomination
---
shared/1systems/wolf.nix | 10 ++++++++++
shared/2configs/shack/worlddomination.nix | 6 +++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix
index f50fc80c4..584ee0373 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 ee461b51c..d0f9f5fa6 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; [