3 files changed, 25 insertions, 27 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;
 }
diff --git a/makefu/1systems/omo/hw/omo.nix b/makefu/1systems/omo/hw/omo.nix
index 31db335bb..87af2a314 100644
--- a/makefu/1systems/omo/hw/omo.nix
+++ b/makefu/1systems/omo/hw/omo.nix
@@ -26,9 +26,10 @@ let
   # |_______|
   # cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6";
   cryptDisk0 = byid "ata-ST8000DM004-2CX188_ZCT01PLV";
-  cryptDisk1 = byid "ata-TP02000GB_TPW151006050068";
-  cryptDisk2 = byid "ata-ST4000DM000-1F2168_Z303HVSG";
+  cryptDisk1 = byid "ata-WDC_WD80EZAZ-11TDBA0_7SJPVLYW";
   cryptDisk3 = byid "ata-ST8000DM004-2CX188_ZCT01SG4";
+  cryptDisk2 = byid "ata-WDC_WD80EZAZ-11TDBA0_7SJPWT5W";
+
   # cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907";
   # all physical disks
 
@@ -48,8 +49,8 @@ in {
 
   makefu.snapraid = {
     enable = true;
-    disks = map toMapper [ 0 2 3 ];
-    parity = toMapper 1;
+    disks = map toMapper [ 0 1 3 ];
+    parity = toMapper 2; # find -name PARITY_PARTITION
   };
   fileSystems = let
     cryptMount = name:
@@ -102,6 +103,8 @@ in {
       "firewire_ohci"
       "usb_storage"
       "usbhid"
+      "raid456"
+      "megaraid_sas"
     ];
 
     kernelModules = [ "kvm-intel" ];
diff --git a/makefu/1systems/omo/source.nix b/makefu/1systems/omo/source.nix
index 0d42cc9e2..05c17377f 100644
--- a/makefu/1systems/omo/source.nix
+++ b/makefu/1systems/omo/source.nix
@@ -1,4 +1,5 @@
 {
   name="omo";
   torrent = true;
+  unstable = true;
 }