summaryrefslogtreecommitdiffstats
path: root/makefu/1systems/omo/config.nix
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-03-23 10:15:42 +0100
committerlassulus <lassulus@lassul.us>2020-03-23 10:15:42 +0100
commit8c27f12f86096f06e56333125eb6c713aece34ed (patch)
tree83d29ab23719468ff6e8d31f29963dd449edbef2 /makefu/1systems/omo/config.nix
parentcab3be8a19d445d3292454099dbc1ca97bca60c5 (diff)
parent8e3cd9fcffc473706a3ebafa5cb80f7a75c29aa5 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/1systems/omo/config.nix')
-rw-r--r--makefu/1systems/omo/config.nix40
1 files changed, 17 insertions, 23 deletions
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 9b9b91a6f..37fb9128d 100644
--- a/makefu/1systems/omo/config.nix
+++ b/makefu/1systems/omo/config.nix
@@ -57,7 +57,7 @@ in {
<stockholm/makefu/2configs/stats/telegraf>
# <stockholm/makefu/2configs/stats/telegraf/europastats.nix>
<stockholm/makefu/2configs/stats/telegraf/hamstats.nix>
- <stockholm/makefu/2configs/stats/arafetch.nix>
+ # <stockholm/makefu/2configs/stats/arafetch.nix>
# services
{
@@ -71,14 +71,9 @@ in {
<stockholm/makefu/2configs/virtualisation/docker.nix>
<stockholm/makefu/2configs/bluetooth-mpd.nix>
- {
- # Risikoübernahme
- nixpkgs.config.permittedInsecurePackages = [
- "homeassistant-0.77.2"
- ];
- }
- <stockholm/makefu/2configs/homeautomation>
- <stockholm/makefu/2configs/homeautomation/google-muell.nix>
+ <stockholm/makefu/2configs/ham>
+ <stockholm/makefu/2configs/ham/google-muell.nix>
+ <stockholm/makefu/2configs/ham/zigbee2mqtt>
{
makefu.ps3netsrv = {
enable = true;
@@ -90,7 +85,6 @@ in {
makefu.mpd.musicDirectory = "/media/cryptX/music";
}
-
# security
<stockholm/makefu/2configs/sshd-totp.nix>
# <stockholm/makefu/2configs/logging/central-logging-client.nix>
@@ -120,7 +114,7 @@ in {
gid = (import <stockholm/lib>).genid "share";
members = [ "makefu" "misa" ];
};
- networking.firewall.trustedInterfaces = [ primaryInterface ];
+ networking.firewall.trustedInterfaces = [ primaryInterface "docker0" ];
@@ -141,18 +135,18 @@ in {
sed-plugin
random-emoji ];
};
- krebs.Reaktor.reaktor-bgt = {
- nickname = "Reaktor|bgt";
- workdir = "/var/lib/Reaktor/bgt";
- channels = [ "#binaergewitter" ];
- plugins = with pkgs.ReaktorPlugins;
- [ titlebot
- # stockholm-issue
- nixos-version
- shack-correct
- sed-plugin
- random-emoji ];
- };
+ #krebs.Reaktor.reaktor-bgt = {
+ # nickname = "Reaktor|bgt";
+ # workdir = "/var/lib/Reaktor/bgt";
+ # channels = [ "#binaergewitter" ];
+ # plugins = with pkgs.ReaktorPlugins;
+ # [ titlebot
+ # # stockholm-issue
+ # nixos-version
+ # shack-correct
+ # sed-plugin
+ # random-emoji ];
+ #};
krebs.build.host = config.krebs.hosts.omo;
}