Merge remote-tracking branch 'gum/master'

2 files changed, 25 insertions, 31 deletions

diff --git a/krebs/2configs/shack/glados/default.nix b/krebs/2configs/shack/glados/default.nix
index dc345cc4e..d000af397 100644
--- a/krebs/2configs/shack/glados/default.nix
+++ b/krebs/2configs/shack/glados/default.nix
@@ -39,8 +39,6 @@ in {
     })).override {
       extraPackages = ps: with ps; [
         python-forecastio jsonrpc-async jsonrpc-websocket mpd2
-        (callPackage ./deps/gtts-token.nix { })
-        (callPackage ./deps/pyhaversion.nix { })
       ];
     };
     autoExtraComponents = true;
@@ -53,20 +51,24 @@ in {
         elevation = 303;
         auth_providers = [
           { type = "homeassistant";}
-          { type = "legacy_api_password";}
           { type = "trusted_networks";
-            # allow_bypass_login = true;
+            trusted_networks = [
+              "127.0.0.1/32"
+              "10.42.0.0/16"
+              "::1/128"
+              "fd00::/8"
+            ];
           }
         ];
       };
       # https://www.home-assistant.io/components/influxdb/
-      influxdb = {
-        database = "hass";
-        tags = {
-          instance = "wolf";
-          source = "hass";
-        };
-      };
+      #influxdb = {
+      #  database = "hass";
+      #  tags = {
+      #    instance = "wolf";
+      #    source = "hass";
+      #  };
+      #};
       mqtt = {
         broker = "localhost";
         port = 1883;
@@ -95,8 +97,7 @@ in {
       ];
 
       sensor =
-        [{ platform = "version"; }]
-        ++ (import ./sensors/hass.nix)
+           (import ./sensors/hass.nix)
         ++ (import ./sensors/power.nix)
         ++ shackopen.sensor;
 
@@ -105,31 +106,24 @@ in {
       camera = [];
 
       frontend = { };
+      config = { };
       http = {
-        # TODO: https://github.com/home-assistant/home-assistant/issues/16149
         base_url = "http://hass.shack";
         use_x_forwarded_for = true;
         trusted_proxies = "127.0.0.1";
-        api_password = "shackit";
-        trusted_networks = [
-          "127.0.0.1/32"
-          "10.42.0.0/16"
-          "::1/128"
-          "fd00::/8"
-        ];
       };
-      conversation = {};
-      history = {};
-      logbook = {};
+      #conversation = {};
+      #history = {};
+      #logbook = {};
       tts = [
-        { platform = "google";
+        { platform = "google_translate";
           language = "de";
         }
-        { platform = "picotts";
-          language = "de-DE";
-        }
+        #{ platform = "picotts";
+        #  language = "de-DE";
+        #}
       ];
-      recorder = {};
+      #recorder = {};
       sun = {};
 
       automation = wasser.automation;
diff --git a/krebs/2configs/shack/node-light.nix b/krebs/2configs/shack/node-light.nix
index 38cb3b55d..9e3828463 100644
--- a/krebs/2configs/shack/node-light.nix
+++ b/krebs/2configs/shack/node-light.nix
@@ -4,8 +4,8 @@ let
   pkg = pkgs.callPackage (
     pkgs.fetchgit {
       url = "https://git.shackspace.de/rz/node-light.git";
-      rev = "32d8064db5172b8068f633211c8bd5688b2c8773";
-      sha256 = "14jzhs7pp3hq42wq3cwqarivn1z7vcgksfzfqfc4yyh21096yi1j";
+      rev = "9c3fe451897cf170fb192a2643180fdfe22388e8";
+      sha256 = "1zsc38idg452r8wpcna5m3yqx0ri11bd1bw60bl0kpz96dqqnyba";
     }) { mkYarnPackage = pkgs.yarn2nix-moretea.mkYarnPackage; };
     home = "/var/lib/node-light";
     port = "8082";