8 files changed, 11 insertions, 12 deletions
diff --git a/makefu/2configs/home/airsonic.nix b/makefu/2configs/home/airsonic.nix
index 15e77438d..c6112be26 100644
--- a/makefu/2configs/home/airsonic.nix
+++ b/makefu/2configs/home/airsonic.nix
@@ -1,6 +1,6 @@
 { config, ... }:
 let
-  internal-ip = "192.168.1.11";
+  internal-ip = "192.168.111.11";
   port = 4040;
 in
 {
diff --git a/makefu/2configs/home/ham/default.nix b/makefu/2configs/home/ham/default.nix
index 33e406e0b..ee3b62428 100644
--- a/makefu/2configs/home/ham/default.nix
+++ b/makefu/2configs/home/ham/default.nix
@@ -5,7 +5,7 @@
 ##
 let
   prefix = (import ./lib).prefix;
-  firetv_stick = "192.168.1.24";
+  firetv_stick = "192.168.111.24";
   hassdir = "/var/lib/hass";
   unstable = import <nixpkgs-unstable> {};
 
@@ -17,7 +17,7 @@ in {
     ./signal-rest
 
     # hass config
-    ../zigbee2mqtt/hass.nix
+    ./zigbee2mqtt.nix
     # ./multi/flurlicht.nix
     ./multi/kurzzeitwecker.nix
     ./multi/the_playlist.nix
@@ -48,8 +48,7 @@ in {
     })).override {
       extraPackages = p: [ 
         (p.callPackage ./deps/dwdwfsapi.nix {}) 
-        (p.callPackage ./deps/pykodi.nix {}) 
-        p.APScheduler ];
+        (p.callPackage ./deps/pykodi.nix {}) ];
     };
 
     config = {
@@ -92,7 +91,7 @@ in {
         }
       ];
       api = {};
-      esphome = {};
+      esphome = {}; # fails
       camera = [];
       #telegram_bot = [
       #  # secrets file: {
diff --git a/makefu/2configs/home/ham/device_tracker/openwrt.nix b/makefu/2configs/home/ham/device_tracker/openwrt.nix
index 0a34f702a..c2b0353c6 100644
--- a/makefu/2configs/home/ham/device_tracker/openwrt.nix
+++ b/makefu/2configs/home/ham/device_tracker/openwrt.nix
@@ -2,7 +2,7 @@
   services.home-assistant.config.device_tracker =
   [
     { platform = "luci";
-      host = "192.168.1.5";
+      host = "192.168.111.5";
       username = "root";
       password = import <secrets/hass/router.nix>;
       interval_seconds = 30; # instead of 12seconds
diff --git a/makefu/2configs/home/ham/nginx.nix b/makefu/2configs/home/ham/nginx.nix
index e166b2a4b..cd99c0739 100644
--- a/makefu/2configs/home/ham/nginx.nix
+++ b/makefu/2configs/home/ham/nginx.nix
@@ -1,5 +1,5 @@
 let
-  internal-ip = "192.168.1.11";
+  internal-ip = "192.168.111.11";
 in {
   services.nginx.recommendedProxySettings = true;
   services.nginx.virtualHosts."hass" = {
diff --git a/makefu/2configs/home/zigbee2mqtt/hass.nix b/makefu/2configs/home/ham/zigbee2mqtt.nix
index faf864ba6..7809dbb51 100644
--- a/makefu/2configs/home/zigbee2mqtt/hass.nix
+++ b/makefu/2configs/home/ham/zigbee2mqtt.nix
@@ -6,7 +6,7 @@
 #   input_select
 #   timer
 let
-  inherit (import ../lib) zigbee;
+  inherit (import ./lib) zigbee;
   prefix = zigbee.prefix;
 in
 {
diff --git a/makefu/2configs/home/metube.nix b/makefu/2configs/home/metube.nix
index c872bea08..50646d210 100644
--- a/makefu/2configs/home/metube.nix
+++ b/makefu/2configs/home/metube.nix
@@ -5,7 +5,7 @@ let
   port = "2348";
   dl-dir = "/media/cryptX/youtube/music";
   uid = 20421;
-  internal-ip = "192.168.1.11";
+  internal-ip = "192.168.111.11";
 in
   {
   systemd.tmpfiles.rules = [
diff --git a/makefu/2configs/home/photoprism.nix b/makefu/2configs/home/photoprism.nix
index ef4200576..ea15f645a 100644
--- a/makefu/2configs/home/photoprism.nix
+++ b/makefu/2configs/home/photoprism.nix
@@ -18,7 +18,7 @@ let
   photodir = "/media/cryptX/photos";
   statedir = "/media/cryptX/lib/photoprism/appsrv";
   db-dir = "/media/cryptX/lib/photoprism/mysql";
-  internal-ip = "192.168.1.11";
+  internal-ip = "192.168.111.11";
   sec = import <secrets/photoprism.nix>;
 in
 {
diff --git a/makefu/2configs/home/zigbee2mqtt/default.nix b/makefu/2configs/home/zigbee2mqtt/default.nix
index 6ccf8b241..873699e3f 100644
--- a/makefu/2configs/home/zigbee2mqtt/default.nix
+++ b/makefu/2configs/home/zigbee2mqtt/default.nix
@@ -3,7 +3,7 @@
 let
   dataDir = "/var/lib/zigbee2mqtt";
   sec = import <secrets/zigbee2mqtt.nix>;
-  internal-ip = "192.168.1.11";
+  internal-ip = "192.168.111.11";
   webport = 8521;
 in
   {