ma 2/homeautomation -> 2/ham

avoid overlapping autocomplete with home-manager

8 files changed, 17 insertions, 22 deletions

diff --git a/makefu/1systems/omo/config.nix b/makefu/1systems/omo/config.nix
index 9b9b91a6..d00d61fd 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
index 56acc2d0..56acc2d0 100644
--- a/makefu/2configs/homeautomation/default.nix
+++ b/makefu/2configs/ham/default.nix
diff --git a/makefu/2configs/homeautomation/google-muell.nix b/makefu/2configs/ham/google-muell.nix
index c81eae20..c81eae20 100644
--- a/makefu/2configs/homeautomation/google-muell.nix
+++ b/makefu/2configs/ham/google-muell.nix
diff --git a/makefu/2configs/homeautomation/lib/default.nix b/makefu/2configs/ham/lib/default.nix
index 8bc54431..8bc54431 100644
--- a/makefu/2configs/homeautomation/lib/default.nix
+++ b/makefu/2configs/ham/lib/default.nix
diff --git a/makefu/2configs/homeautomation/mqtt.nix b/makefu/2configs/ham/mqtt.nix
index cd1c328d..cd1c328d 100644
--- a/makefu/2configs/homeautomation/mqtt.nix
+++ b/makefu/2configs/ham/mqtt.nix
diff --git a/makefu/2configs/homeautomation/multi/timer.nix b/makefu/2configs/ham/multi/timer.nix
index eafb7841..eafb7841 100644
--- a/makefu/2configs/homeautomation/multi/timer.nix
+++ b/makefu/2configs/ham/multi/timer.nix
diff --git a/makefu/2configs/homeautomation/multi/zigbee2mqtt.nix b/makefu/2configs/ham/multi/zigbee2mqtt.nix
index ba81b129..ba81b129 100644
--- a/makefu/2configs/homeautomation/multi/zigbee2mqtt.nix
+++ b/makefu/2configs/ham/multi/zigbee2mqtt.nix
diff --git a/makefu/2configs/homeautomation/sensor/outside.nix b/makefu/2configs/ham/sensor/outside.nix
index 8436b8de..8436b8de 100644
--- a/makefu/2configs/homeautomation/sensor/outside.nix
+++ b/makefu/2configs/ham/sensor/outside.nix