summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-01-27 10:56:16 +0100
committerlassulus <lassulus@lassul.us>2022-01-27 10:56:16 +0100
commit61f7ba2bddf74f73077e43468e2ba2ef153852c9 (patch)
tree027946b502aa03e14943aa7a8ef7c5eb657cc200 /makefu/2configs
parent83ec0fdb970c4aa0e29d221cb25aac2115e5abcd (diff)
parent14e797325e2b0b99b42332868eea10bebe5390f0 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/default.nix1
-rw-r--r--makefu/2configs/home/ham/light/arbeitszimmer.nix13
-rw-r--r--makefu/2configs/home/ham/light/tint_arbeitszimmer.nix278
-rw-r--r--makefu/2configs/home/ham/light/tint_wohnzimmer.nix2
-rw-r--r--makefu/2configs/home/ham/light/wohnzimmer.nix7
-rw-r--r--makefu/2configs/security/hotfix.nix4
6 files changed, 294 insertions, 11 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index bb5c057be..7905cf4eb 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -11,6 +11,7 @@ with import <stockholm/lib>;
./editor/vim.nix
./binary-cache/nixos.nix
./minimal.nix
+ ./security/hotfix.nix
];
# users are super important
diff --git a/makefu/2configs/home/ham/light/arbeitszimmer.nix b/makefu/2configs/home/ham/light/arbeitszimmer.nix
index 45fbfb57b..6e572c763 100644
--- a/makefu/2configs/home/ham/light/arbeitszimmer.nix
+++ b/makefu/2configs/home/ham/light/arbeitszimmer.nix
@@ -10,6 +10,8 @@ let
"light.arbeitszimmer_pflanzenlicht"
];
in {
+ imports = [ ./tint_arbeitszimmer.nix ];
+
services.home-assistant.config.light = [
{
platform = "group";
@@ -27,16 +29,5 @@ in {
}
];
services.home-assistant.config.automation = [
- {
- alias = "Toggle Arbeitszimmerbeleuchtung via Remote";
- trigger = {
- platform = "state";
- entity_id = "sensor.arbeitszimmer_remote1_action";
- };
- action = {
- service = "light.toggle";
- data.entity_id = "light.arbeitszimmerbeleuchtung";
- };
- }
];
}
diff --git a/makefu/2configs/home/ham/light/tint_arbeitszimmer.nix b/makefu/2configs/home/ham/light/tint_arbeitszimmer.nix
new file mode 100644
index 000000000..37c961adc
--- /dev/null
+++ b/makefu/2configs/home/ham/light/tint_arbeitszimmer.nix
@@ -0,0 +1,278 @@
+{ lib, ...}:
+
+let
+ # effect - color
+ # Solid Pattern - Hult
+ group_id_1 = 16388;
+ group_id_2 = 16389;
+ group_id_3 = 16390;
+ remote = "sensor.arbeitszimmer_remote1_action";
+ main_light_1 = "light.wled_4";
+ default_scene_1 = "Solid";
+ default_color_1 = "Default";
+ main_color_select_1 = "select.wled_color_palette_4";
+ light_group_1 = { entity_id = [ main_light_1 ];};
+
+ # contains only the actually changeable lights
+ light_group_2 = { entity_id = [
+ "light.arbeitszimmer_schrank_dimmer"
+ ];
+ };
+ light_group_3 = { entity_id = [ "light.arbeitszimmer_pflanzenlicht" ]; };
+
+ statecond = cond: { # cond must be a list
+ condition = "template";
+ value_template = "{{ trigger.to_state.attributes.action in ( " +
+ (lib.concatMapStringsSep "," (x: "'${x}'") cond) + ") }}";
+ };
+in {
+ services.home-assistant.config.automation = [
+ {
+ alias = "Perform Actions with ${remote}";
+ mode = "queued";
+ max = 5;
+ max_exceeded = "silent";
+ trigger = {
+ platform = "state";
+ entity_id = remote;
+ };
+ condition = {
+ condition = "and";
+ conditions = [
+ {
+ condition = "template";
+ value_template = "{{ trigger.from_state.state != trigger.to_state.state }}";
+ }
+ ( statecond [ "off" "on" "color_wheel"
+ "brightness_up_click" "brightness_down_click"
+ "color_temp" "color_temperature_move"
+ "brightness_step_down" "brightness_step_up" "brightness_down_hold" "brightness_down_release" "brightness_up_hold" "brightness_up_release"
+ "scene_3" "scene_1" "scene_2" # working sunset party
+ "scene_6" "scene_4" "scene_5" # night campfire romantic
+ ])
+ ];
+ };
+ action = [
+ { service = "system_log.write";
+ data = {
+ level = "info";
+ message = "Tint Button pressed: {{ trigger.to_state.state }} Group: {{ trigger.to_state.attributes.action_group }} Length {{ input_working_scene_1 | length }}";
+ };
+ }
+ {
+ choose = [
+ { # light group 1
+ conditions = {
+ condition = "template";
+ value_template = "{{ trigger.to_state.attributes.action_group == ${toString group_id_1} }}";
+ };
+ sequence = [
+ {
+ choose = [
+ {
+ conditions = statecond [ "on" "off" ];
+ sequence = {
+ service = "light.turn_{{ trigger.to_state.state }}";
+ target = light_group_1;
+ };
+ }
+ {
+ conditions = statecond [ "color_wheel" ];
+ sequence = {
+ data.xy_color = [
+ "{{ trigger.to_state.attributes.action_color.x | float }}"
+ "{{ trigger.to_state.attributes.action_color.y | float }}"
+ ];
+ service = "light.turn_on";
+ target = light_group_1;
+ };
+ }
+ {
+ conditions = statecond [ "color_temp" ];
+ sequence = {
+ data.color_temp = "{{ trigger.to_state.attributes.action_color_temperature | float }}";
+ service = "light.turn_on";
+ target = light_group_1;
+ };
+ }
+ {
+ conditions = statecond [ "brightness_up_click" "brightness_down_click" ];
+ sequence = [
+ {
+ variables.factor = ''{% if trigger.to_state.state in ( "brightness_down_click") %} -12 {% else %} 12 {% endif %}'';
+ }
+ {
+ data.brightness_step_pct = "{{ factor | int }}";
+ service = "light.turn_on";
+ target = light_group_1;
+ }
+ ];
+ }
+ {
+ conditions = statecond [
+ "scene_3" # working => previous scene
+ "scene_1" # sunset => default scene (solid)
+ "scene_2" # party => next scene
+
+ ];
+ sequence = [
+ {
+ data.effect = ''
+ {% set options = state_attr("${main_light_1}","effect_list") -%}
+ {% set selection = options.index(state_attr("${main_light_1}","effect")) -%}
+ {% if trigger.to_state.attributes.action == "scene_2" -%}
+ {% if (selection + 1) >= options | length -%}
+ {{ options[0] }}
+ {% else -%}
+ {{ options[selection + 1] }}
+ {% endif %}
+ {% elif trigger.to_state.attributes.action == "scene_1" -%}
+ ${default_scene_1}
+ {% elif trigger.to_state.attributes.action == "scene_3" -%}
+ {{ options[selection - 1] }}
+ {% endif -%}
+ '';
+ service = "light.turn_on";
+ target.entity_id = main_light_1;
+ }
+ ];
+ }
+ {
+ conditions = statecond [
+ "scene_6" # night => previous color
+ "scene_4" # campfire => default Color (Default)
+ "scene_5" # romance => next color
+
+ ];
+ sequence = [
+ {
+ data.option = ''
+ {% set options = state_attr("${main_color_select_1}","options") -%}
+ {% set selection = options.index(states("${main_color_select_1}")) -%}
+ {% if trigger.to_state.attributes.action == "scene_5" -%}
+ {% if (selection + 1) >= options | length -%}
+ {{ options[0] }}
+ {% else -%}
+ {{ options[selection + 1] }}
+ {% endif %}
+ {% elif trigger.to_state.attributes.action == "scene_4" -%}
+ ${default_color_1}
+ {% elif trigger.to_state.attributes.action == "scene_6" -%}
+ {{ options[selection - 1] }}
+ {% endif -%}
+ '';
+ service = "select.select_option";
+ target.entity_id = main_color_select_1;
+ }
+ ];
+ }
+ ];
+ }
+ ];
+ }
+ { # light group 2
+ conditions = {
+ condition = "template";
+ value_template = "{{ trigger.to_state.attributes.action_group == ${toString group_id_2} }}";
+ };
+ sequence = [
+ {
+ choose = [
+ { conditions = statecond [ "on" "off" ];
+ sequence = {
+ service = "light.turn_{{ trigger.to_state.state }}";
+ target = light_group_2;
+ };
+ }
+ {
+ conditions = statecond [ "color_wheel" ];
+ sequence = {
+ data.xy_color = [
+ "{{ trigger.to_state.attributes.action_color.x | float }}"
+ "{{ trigger.to_state.attributes.action_color.y | float }}"
+ ];
+ service = "light.turn_on";
+ target = light_group_2;
+ };
+ }
+ {
+ conditions = statecond [ "color_temp" ];
+ sequence = {
+ data.color_temp = "{{ trigger.to_state.attributes.action_color_temperature | float }}";
+ service = "light.turn_on";
+ target = light_group_2;
+ };
+ }
+ {
+ conditions = statecond [ "brightness_up_click" "brightness_down_click" ];
+ sequence = [
+ {
+ variables.factor = ''{% if trigger.to_state.state in ( "brightness_down_click") %} -12 {% else %} 12 {% endif %}'';
+ }
+ {
+ data.brightness_step_pct = "{{ factor | int }}";
+ service = "light.turn_on";
+ target = light_group_2;
+ }
+ ];
+ }
+ ];
+ }
+ ];
+ }
+ { # light group 3
+ conditions = {
+ condition = "template";
+ value_template = "{{ trigger.to_state.attributes.action_group == ${toString group_id_3} }}";
+ };
+ sequence = [
+ {
+ choose = [
+ { conditions = statecond [ "on" "off" ];
+ sequence = {
+ service = "light.turn_{{ trigger.to_state.state }}";
+ target = light_group_3;
+ };
+ }
+ {
+ conditions = statecond [ "color_wheel" ];
+ sequence = {
+ data.xy_color = [
+ "{{ trigger.to_state.attributes.action_color.x | float }}"
+ "{{ trigger.to_state.attributes.action_color.y | float }}"
+ ];
+ service = "light.turn_on";
+ target = light_group_3;
+ };
+ }
+ {
+ conditions = statecond [ "color_temperature_move" ];
+ sequence = {
+ data.color_temp = "{{ trigger.to_state.attributes.action_color_temperature | float }}";
+ service = "light.turn_on";
+ target = light_group_3;
+ };
+ }
+ {
+ conditions = statecond [ "brightness_up_click" "brightness_down_click" ];
+ sequence = [
+ {
+ variables.factor = ''{% if trigger.to_state.state in ( "brightness_down_click") %} -12 {% else %} 12 {% endif %}'';
+ }
+ {
+ data.brightness_step_pct = "{{ factor | int }}";
+ service = "light.turn_on";
+ target = light_group_3;
+ }
+ ];
+ }
+ ];
+ }
+ ];
+ }
+ ];
+ }
+ ];
+ }
+ ];
+}
diff --git a/makefu/2configs/home/ham/light/tint_wohnzimmer.nix b/makefu/2configs/home/ham/light/tint_wohnzimmer.nix
index c9aeb850b..18e69a779 100644
--- a/makefu/2configs/home/ham/light/tint_wohnzimmer.nix
+++ b/makefu/2configs/home/ham/light/tint_wohnzimmer.nix
@@ -15,6 +15,8 @@
# {% endif -%}
let
+ # Solid Pattern
+ # Hult
group_id_1 = 16388;
group_id_2 = 16389;
group_id_3 = 16390;
diff --git a/makefu/2configs/home/ham/light/wohnzimmer.nix b/makefu/2configs/home/ham/light/wohnzimmer.nix
index bc9c2778a..554d1f8ce 100644
--- a/makefu/2configs/home/ham/light/wohnzimmer.nix
+++ b/makefu/2configs/home/ham/light/wohnzimmer.nix
@@ -9,6 +9,8 @@ let
"light.kinderzimmer_lichterkette_licht" # led um fenster
];
in {
+ imports = [ ./tint_wohnzimmer.nix ];
+ services.home-assistant.config.wled = {};
services.home-assistant.config.light = [
{
platform = "group";
@@ -22,3 +24,8 @@ in {
}
];
}
+
+# trigger.to_state.attributes.action_group:
+# 1: 18388
+# 2: 18389
+# 3: 18390
diff --git a/makefu/2configs/security/hotfix.nix b/makefu/2configs/security/hotfix.nix
new file mode 100644
index 000000000..fc52f21e6
--- /dev/null
+++ b/makefu/2configs/security/hotfix.nix
@@ -0,0 +1,4 @@
+{ pkgs, lib,... }: {
+ # https://github.com/berdav/CVE-2021-4034
+ security.wrappers.pkexec.source = lib.mkForce (pkgs.writeText "pkexec" "");
+}