summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-11-25 18:32:06 +0100
committerlassulus <lassulus@lassul.us>2018-11-25 18:32:06 +0100
commit8bbc740360d97053b2ee589f0e560b4ed0581f32 (patch)
tree0fe554f4f4e1ee7719ec46a2f3b98b6d3be719f0
parent91e4f7fd9202086c137920e712ed810afafca6e7 (diff)
parentc15c3d82bb9055f3af5033c89cfbbbbba975e4a4 (diff)
Merge remote-tracking branch 'hotdog/makefu'
-rw-r--r--makefu/1systems/omo/config.nix11
-rw-r--r--makefu/1systems/wbob/config.nix7
2 files changed, 16 insertions, 2 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 9eb8cbf49..260f96081 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -63,9 +63,17 @@ in {
}
# <stockholm/makefu/2configs/syncthing.nix>
<stockholm/makefu/2configs/remote-build/slave.nix>
- <stockholm/makefu/2configs/deployment/google-muell.nix>
+ # TODO:
+ # <stockholm/makefu/2configs/deployment/google-muell.nix>
<stockholm/makefu/2configs/virtualisation/docker.nix>
<stockholm/makefu/2configs/bluetooth-mpd.nix>
+
+ {
+ # Risikoübernahme
+ nixpkgs.config.permittedInsecurePackages = [
+ "homeassistant-0.77.2"
+ ];
+ }
<stockholm/makefu/2configs/deployment/homeautomation>
{
makefu.ps3netsrv = {
@@ -97,6 +105,7 @@ in {
];
makefu.full-populate = true;
+ nixpkgs.config.allowUnfree = true;
krebs.rtorrent = (builtins.trace (builtins.toJSON config.services.telegraf.extraConfig)) {
downloadDir = lib.mkForce "/media/cryptX/torrent";
extraConfig = ''
diff --git a/makefu/1systems/wbob/config.nix b/makefu/1systems/wbob/config.nix
index 24a3dddc6..f2311fb55 100644
--- a/makefu/1systems/wbob/config.nix
+++ b/makefu/1systems/wbob/config.nix
@@ -45,7 +45,12 @@ in {
# <stockholm/makefu/2configs/stats/telegraf/bamstats.nix>
{ environment.systemPackages = [ pkgs.vlc ]; }
-
+ {
+ # Risikoübernahme
+ nixpkgs.config.permittedInsecurePackages = [
+ "homeassistant-0.77.2"
+ ];
+ }
<stockholm/makefu/2configs/deployment/bureautomation>
<stockholm/makefu/2configs/deployment/bureautomation/mpd.nix>
<stockholm/makefu/2configs/deployment/bureautomation/hass.nix>