summaryrefslogtreecommitdiffstats
path: root/shared/1systems
diff options
context:
space:
mode:
authorlassulus <lass@lassul.us>2017-06-18 14:09:14 +0200
committerlassulus <lass@lassul.us>2017-06-18 14:09:14 +0200
commitef2f6afaa331113eb45d43845cb42d54a1430982 (patch)
tree9a59bef8ab2aec36d8cb5a08e690a4a9432967a1 /shared/1systems
parent838f40d55060142395c240a8ef7808a11d137914 (diff)
parent5cb26223e2f5c361fa68a8b6d50575c06942e471 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared/1systems')
-rw-r--r--shared/1systems/wolf.nix10
1 files changed, 10 insertions, 0 deletions
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;
[cgit] Unable to lock slot /tmp/cgit/b6000000.lock: Permission denied (13)