diff options
| author | tv <tv@krebsco.de> | 2017-06-18 16:12:54 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2017-06-18 16:12:54 +0200 |
| commit | 8cb9d8ac4f99ed0a930b1657c4ef2ea769c5a86c (patch) | |
| tree | 4459cf7a7c5d897830fde0edfa0e41297a223980 /shared/1systems | |
| parent | 11a16797df89862be7dff81b6af5cd5bf41b580c (diff) | |
| parent | ef2f6afaa331113eb45d43845cb42d54a1430982 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'shared/1systems')
| -rw-r--r-- | shared/1systems/wolf.nix | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/shared/1systems/wolf.nix b/shared/1systems/wolf.nix index 9acc589..584ee03 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,14 @@ in ../2configs/graphite.nix ../2configs/repo-sync.nix ../2configs/shared-buildbot.nix - ../2configs/shack/drivedroid.nix - ../2configs/shack/nix-cacher.nix + ../2configs/shack/worlddomination.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 +44,6 @@ in nix = { binaryCaches = [ - "http://localhost:3142/nixos" "http://cache.prism.r" "https://cache.nixos.org/" ]; @@ -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; |