summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/ham
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-05-25 16:07:42 +0200
committerlassulus <lassulus@lassul.us>2020-05-25 16:07:42 +0200
commit6c8210f93ae6715cbf5aa2adfef8bfd6bfc908b2 (patch)
treef4f87d2212f9c3f628c7ed6b5f652e323642fd52 /makefu/2configs/ham
parentd8386001a04b081e5779386b911cf7d4e9fd30e0 (diff)
parent4ba18c6d2a442834e79b5526eff0aa2c5f8398e8 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/ham')
-rw-r--r--makefu/2configs/ham/androidtv/default.nix4
-rw-r--r--makefu/2configs/ham/default.nix1
-rw-r--r--makefu/2configs/ham/zigbee2mqtt/default.nix1
3 files changed, 4 insertions, 2 deletions
diff --git a/makefu/2configs/ham/androidtv/default.nix b/makefu/2configs/ham/androidtv/default.nix
index b7d397db4..9899b2dd3 100644
--- a/makefu/2configs/ham/androidtv/default.nix
+++ b/makefu/2configs/ham/androidtv/default.nix
@@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "androidtv";
- version = "0.0.38";
+ version = "0.0.39";
src = fetchPypi {
inherit pname version;
- sha256 = "0ri1fnc63zashc667w2mlpb0c7ri3x6wnhnf54klb89v73pdnb8k";
+ sha256 = "06lrjj74g2f3pkhsn3c8h13mkykgqqf4g9q6x5yv23z6ghjnk2dz";
};
propagatedBuildInputs = [
diff --git a/makefu/2configs/ham/default.nix b/makefu/2configs/ham/default.nix
index ddcf65b5a..2db4ad4de 100644
--- a/makefu/2configs/ham/default.nix
+++ b/makefu/2configs/ham/default.nix
@@ -35,6 +35,7 @@ in {
];
};
config = {
+ config = {};
input_select = zigbee.input_select; # dict
timer = zigbee.timer // kurzzeitwecker.timer; # dict
homeassistant = {
diff --git a/makefu/2configs/ham/zigbee2mqtt/default.nix b/makefu/2configs/ham/zigbee2mqtt/default.nix
index 7c55326f9..84d32c872 100644
--- a/makefu/2configs/ham/zigbee2mqtt/default.nix
+++ b/makefu/2configs/ham/zigbee2mqtt/default.nix
@@ -17,4 +17,5 @@
volumes = ["/var/lib/zigbee2mqtt:/app/data"];
};
state = [ "/var/lib/zigbee2mqtt/configuration.yaml" "/var/lib/zigbee2mqtt/state.json" ];
+ systemd.services.docker-zigbee2mqtt.after = [ "home-assistant.service" "docker.service" "network-online.target" ];
}