From d31fbfe31ee26b70f13c93d910f5ce0d3ce1d8c2 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 5 Feb 2020 17:34:44 +0100
Subject: [PATCH] ma 2/homeautomation -> 2/ham
avoid overlapping autocomplete with home-manager
---
makefu/1systems/omo/config.nix | 39 ++++++++-----------
.../{homeautomation => ham}/default.nix | 0
.../{homeautomation => ham}/google-muell.nix | 0
.../{homeautomation => ham}/lib/default.nix | 0
.../2configs/{homeautomation => ham}/mqtt.nix | 0
.../{homeautomation => ham}/multi/timer.nix | 0
.../multi/zigbee2mqtt.nix | 0
.../sensor/outside.nix | 0
8 files changed, 17 insertions(+), 22 deletions(-)
rename makefu/2configs/{homeautomation => ham}/default.nix (100%)
rename makefu/2configs/{homeautomation => ham}/google-muell.nix (100%)
rename makefu/2configs/{homeautomation => ham}/lib/default.nix (100%)
rename makefu/2configs/{homeautomation => ham}/mqtt.nix (100%)
rename makefu/2configs/{homeautomation => ham}/multi/timer.nix (100%)
rename makefu/2configs/{homeautomation => ham}/multi/zigbee2mqtt.nix (100%)
rename makefu/2configs/{homeautomation => ham}/sensor/outside.nix (100%)
diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 9b9b91a6f..d00d61fdc 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;
@@ -120,7 +115,7 @@ in {
gid = (import <stockholm/lib>).genid "share";
members = [ "makefu" "misa" ];
};
- networking.firewall.trustedInterfaces = [ primaryInterface ];
+ networking.firewall.trustedInterfaces = [ primaryInterface "docker0" ];
@@ -141,18 +136,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;
}
diff --git a/makefu/2configs/homeautomation/default.nix b/makefu/2configs/ham/default.nix
similarity index 100%
rename from makefu/2configs/homeautomation/default.nix
rename to makefu/2configs/ham/default.nix
diff --git a/makefu/2configs/homeautomation/google-muell.nix b/makefu/2configs/ham/google-muell.nix
similarity index 100%
rename from makefu/2configs/homeautomation/google-muell.nix
rename to makefu/2configs/ham/google-muell.nix
diff --git a/makefu/2configs/homeautomation/lib/default.nix b/makefu/2configs/ham/lib/default.nix
similarity index 100%
rename from makefu/2configs/homeautomation/lib/default.nix
rename to makefu/2configs/ham/lib/default.nix
diff --git a/makefu/2configs/homeautomation/mqtt.nix b/makefu/2configs/ham/mqtt.nix
similarity index 100%
rename from makefu/2configs/homeautomation/mqtt.nix
rename to makefu/2configs/ham/mqtt.nix
diff --git a/makefu/2configs/homeautomation/multi/timer.nix b/makefu/2configs/ham/multi/timer.nix
similarity index 100%
rename from makefu/2configs/homeautomation/multi/timer.nix
rename to makefu/2configs/ham/multi/timer.nix
diff --git a/makefu/2configs/homeautomation/multi/zigbee2mqtt.nix b/makefu/2configs/ham/multi/zigbee2mqtt.nix
similarity index 100%
rename from makefu/2configs/homeautomation/multi/zigbee2mqtt.nix
rename to makefu/2configs/ham/multi/zigbee2mqtt.nix
diff --git a/makefu/2configs/homeautomation/sensor/outside.nix b/makefu/2configs/ham/sensor/outside.nix
similarity index 100%
rename from makefu/2configs/homeautomation/sensor/outside.nix
rename to makefu/2configs/ham/sensor/outside.nix