From 39114092c06dbd04cdebf5d94cc386bfe35c601a Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 18 Mar 2021 21:12:43 +0100
Subject: [PATCH] fixing stuff

---
 configs/pepe/home-assistant.nix             |  1 -
 configs/pepe/home-assistant/zigbee2mqtt.nix | 11 ++++++++++-
 configs/sternchen/configuration.nix         | 13 ++++++++++---
 mqtt/heater.py                              |  2 ++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/configs/pepe/home-assistant.nix b/configs/pepe/home-assistant.nix
index 866a6d9..0276fcf 100644
--- a/configs/pepe/home-assistant.nix
+++ b/configs/pepe/home-assistant.nix
@@ -236,7 +236,6 @@ in {
 
     };
 
-
   };
 
   services.home-assistant = {
diff --git a/configs/pepe/home-assistant/zigbee2mqtt.nix b/configs/pepe/home-assistant/zigbee2mqtt.nix
index ed14614..b900e87 100644
--- a/configs/pepe/home-assistant/zigbee2mqtt.nix
+++ b/configs/pepe/home-assistant/zigbee2mqtt.nix
@@ -21,7 +21,16 @@ in {
   services.zigbee2mqtt = {
     enable = true;
     #package = pkgs.own_zigbee2mqtt;
-    package = unstable.zigbee2mqtt;
+    #package = unstable.zigbee2mqtt;
+    package = unstable.zigbee2mqtt.overrideAttrs (old: rec {
+      version = "1.18.1";
+      src = pkgs.fetchFromGitHub {
+        owner = "Koenkk";
+        repo = "zigbee2mqtt";
+        rev = version;
+        sha256 = "1x73k346ayik5hv5axa3nvmd82mgwyrpxqv3dxnffi8aa1r8pf8x";
+      };
+    });
     config = {
 
       # Home Assistant integration (MQTT discovery)
diff --git a/configs/sternchen/configuration.nix b/configs/sternchen/configuration.nix
index 61fa741..1e591a6 100644
--- a/configs/sternchen/configuration.nix
+++ b/configs/sternchen/configuration.nix
@@ -57,11 +57,18 @@
   };
 
   services.xserver.displayManager.defaultSession = "plasma5";
-  services.xserver.desktopManager.pantheon.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-  services.xserver.desktopManager.xfce.enable = true;
+
+  services.xserver.desktopManager.pantheon.enable = false;
+  services.xserver.desktopManager.xfce.enable = false;
   services.xserver.desktopManager.gnome3.enable = false;
 
+  services.xserver.desktopManager.cinnamon.enable = true;
+  services.xserver.desktopManager.lxqt.enable = true;
+  services.xserver.desktopManager.mate.enable = true;
+
+  services.xserver.desktopManager.plasma5.enable = true;
+  services.xserver.desktopManager.plasma5.phononBackend = "vlc";
+
   # stuff
   # -----
   custom.samba-share = {
diff --git a/mqtt/heater.py b/mqtt/heater.py
index 1e0a07a..255e048 100644
--- a/mqtt/heater.py
+++ b/mqtt/heater.py
@@ -17,6 +17,8 @@ class Heater:
         payload = {
             "system_mode": "auto",
             "current_heating_setpoint": self.wanted_temperature,
+            #"occupied_heating_setpoint": self.wanted_temperature,
+            #"unoccupied_heating_setpoint": self.wanted_temperature,
             "eurotronic_host_flags": {"window_open": True}
         }
         return json.dumps(payload)