summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-03-07 23:21:54 +0100
committerlassulus <lassulus@lassul.us>2021-03-07 23:21:54 +0100
commit6fee4ac9fef8200624e62f5e339abfae860ff497 (patch)
treeed3cb6afa03d0abc1f1072704268b9e016b487ef
parentae42cedf260162e4d54b39896c097fef9361f176 (diff)
parentd239a236b03fd4bbcf936bed027d9c0ef76b726f (diff)
Merge remote-tracking branch 'gum/master'
-rw-r--r--makefu/2configs/ham/automation/moodlight.nix13
-rw-r--r--makefu/2configs/ham/deps/dwdwfsapi.nix38
-rw-r--r--makefu/2configs/ham/deps/pykodi.nix37
-rw-r--r--makefu/krops.nix2
4 files changed, 85 insertions, 5 deletions
diff --git a/makefu/2configs/ham/automation/moodlight.nix b/makefu/2configs/ham/automation/moodlight.nix
index df229f16b..d0e336851 100644
--- a/makefu/2configs/ham/automation/moodlight.nix
+++ b/makefu/2configs/ham/automation/moodlight.nix
@@ -5,14 +5,19 @@ let
arbeitszimmer = "light.box_led_status";
final_off = "01:00";
- turn_on = entity_id: at:
+ turn_on = entity_id: at: extra:
{ alias = "Turn on ${entity_id} at ${at}";
trigger = [
{ platform = "time"; inherit at; }
];
action =
[
- { service = "light.turn_on"; inherit entity_id; }
+ ({ service = "light.turn_on";
+ data = {
+ inherit entity_id;
+
+ } // extra;
+ })
];
};
in
@@ -21,8 +26,8 @@ in
{
automation =
[
- (turn_on wohnzimmer "17:30")
- (turn_on arbeitszimmer "9:00")
+ # (turn_on wohnzimmer "17:30")
+ (turn_on arbeitszimmer "9:00" { effect = "Slow Random Twinkle";})
{ alias = "Always turn off the lights at ${final_off}";
trigger = [
diff --git a/makefu/2configs/ham/deps/dwdwfsapi.nix b/makefu/2configs/ham/deps/dwdwfsapi.nix
new file mode 100644
index 000000000..d59dfa9e8
--- /dev/null
+++ b/makefu/2configs/ham/deps/dwdwfsapi.nix
@@ -0,0 +1,38 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, requests
+, ciso8601
+, urllib3
+}:
+
+buildPythonPackage rec {
+ pname = "dwdwfsapi";
+ version = "1.0.3";
+
+ disabled = false; # requires python version >=3.6
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "3d7d5bd66b1a647f07295068dc653b4ceafc2e8ec834b8e32419031c7b3a9b39";
+ };
+
+ # # Package conditions to handle
+ # # might have to sed setup.py and egg.info in patchPhase
+ # # sed -i "s/<package>.../<package>/"
+ # requests>=2.23.0,<3
+ # ciso8601>=2.1.3,<3
+ # urllib3>=1.25.8,<2
+ propagatedBuildInputs = [
+ requests
+ ciso8601
+ urllib3
+ ];
+
+ meta = with lib; {
+ description = "Python client to retrieve data provided by DWD via their geoserver WFS API";
+ homepage = https://github.com/stephan192/dwdwfsapi;
+ license = licenses.mit;
+ # maintainers = [ maintainers. ];
+ };
+}
diff --git a/makefu/2configs/ham/deps/pykodi.nix b/makefu/2configs/ham/deps/pykodi.nix
new file mode 100644
index 000000000..85a541f8a
--- /dev/null
+++ b/makefu/2configs/ham/deps/pykodi.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, jsonrpc-async
+, jsonrpc-websocket
+, aiohttp
+}:
+
+buildPythonPackage rec {
+ pname = "pykodi";
+ version = "0.2.2";
+
+ disabled = false; # requires python version >=3.7.0
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "43e7036a00a76f65c34dc5e7f1065a3ef071eea7619c2e6228e521b638e640bc";
+ };
+
+ # # Package conditions to handle
+ # # might have to sed setup.py and egg.info in patchPhase
+ # # sed -i "s/<package>.../<package>/"
+ # jsonrpc-async>=1.1.0
+ # jsonrpc-websocket>=1.2.1
+ propagatedBuildInputs = [
+ jsonrpc-async
+ jsonrpc-websocket
+ aiohttp
+ ];
+
+ meta = with lib; {
+ description = "An async python interface for Kodi over JSON-RPC";
+ homepage = https://github.com/OnFreund/PyKodi;
+ license = licenses.mit;
+ # maintainers = [ maintainers. ];
+ };
+}
diff --git a/makefu/krops.nix b/makefu/krops.nix
index 2fa050e95..a03fea029 100644
--- a/makefu/krops.nix
+++ b/makefu/krops.nix
@@ -71,7 +71,7 @@
(lib.mkIf ( host-src.hw ) {
nixos-hardware.git = {
url = https://github.com/nixos/nixos-hardware.git;
- ref = "30fdd53";
+ ref = "a0d8383";
};
})
(lib.mkIf ( host-src.home-manager ) {