Merge remote-tracking branch 'gum/master'

4 files changed, 42 insertions, 15 deletions

diff --git a/makefu/2configs/home/ham/automation/find_phone.nix b/makefu/2configs/home/ham/automation/find_phone.nix
new file mode 100644
index 000000000..d94942c9f
--- /dev/null
+++ b/makefu/2configs/home/ham/automation/find_phone.nix
@@ -0,0 +1,32 @@
+{
+  services.home-assistant.config.script = {
+    find_felix_phone.sequence = [
+      {
+        service = "notify.mobile_app_pixel_3a";
+        data = {
+            title= "Finde Mich!";
+            message= "Such Such Such";
+            data = {
+              ttl = 0;
+              priority = "high";
+              channel = "alarm_stream";
+            };
+        };
+      }
+    ];
+    find_tablet.sequence = [
+      {
+        service = "notify.mobile_app_nova3";
+        data = {
+            title = "Finde Mich!";
+            message = "Such Such Such";
+            data = {
+              ttl = 0;
+              priority = "high";
+              channel = "alarm_stream";
+            };
+        };
+      }
+    ];
+  };
+}
diff --git a/makefu/2configs/home/ham/automation/urlaub.nix b/makefu/2configs/home/ham/automation/urlaub.nix
index 7f47c9da5..019e65d25 100644
--- a/makefu/2configs/home/ham/automation/urlaub.nix
+++ b/makefu/2configs/home/ham/automation/urlaub.nix
@@ -11,18 +11,6 @@ let
   weihnachtslicht = "light.wohnzimmer_fenster_lichterkette_licht";
   fernsehlicht = "light.wled";
 
-  all_lights = [
-    schranklicht weihnachtslicht fernsehlicht 
-    # extra lights to also turn off
-    # wohnzimmer
-    "light.wohnzimmer_komode_osram"
-    "light.wohnzimmer_stehlampe_osram"
-    # arbeitszimmer
-    "light.wled_4"
-    "light.arbeitszimmer_schrank_dimmer"
-    "light.arbeitszimmer_pflanzenlicht"
-  ];
-
   final_off = "00:37";
 
   turn_on = entity_id: offset:
diff --git a/makefu/2configs/home/ham/default.nix b/makefu/2configs/home/ham/default.nix
index 861ec27aa..ca5fcd17c 100644
--- a/makefu/2configs/home/ham/default.nix
+++ b/makefu/2configs/home/ham/default.nix
@@ -44,9 +44,10 @@ in {
     ./automation/wohnzimmer_rf_fernbedienung.nix
     # ./automation/ladestecker_timer.nix
     ./automation/flurlicht.nix
-    ./automation/giesskanne.nix
-    ./automation/pflanzen_giessen_erinnerung.nix
-    # ./automation/urlaub.nix
+    # ./automation/giesskanne.nix 
+    # ./automation/pflanzen_giessen_erinnerung.nix
+    ./automation/find_phone.nix
+    ./automation/urlaub.nix
     ./automation/moodlight.nix
     ./automation/shutdown_button.nix
     ./automation/project_tracker.nix
diff --git a/makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix b/makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix
index 26fec370f..11d13886e 100644
--- a/makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix
+++ b/makefu/2configs/home/ham/media/arbeitszimmer_matrix.nix
@@ -63,6 +63,12 @@ in
 
             (remote_action "b9"  [ { service = "rest_command.good_song"; } ])
             (remote_action "b10" [ { service = "rest_command.bad_song";  } ])
+            (remote_action "b11" [
+              {
+                service = "script.turn_on";
+                target.entity_id = "script.find_felix_phone";
+              }
+            ])
 
             (remote_action "3" 
               ((say "Starte Lass") ++ [