diff --git a/hosts/fw.cloonar.com/modules/dhcp4.nix b/hosts/fw.cloonar.com/modules/dhcp4.nix index 5584383..751b65e 100644 --- a/hosts/fw.cloonar.com/modules/dhcp4.nix +++ b/hosts/fw.cloonar.com/modules/dhcp4.nix @@ -198,7 +198,7 @@ } { name = "domain-name"; - data = "cloonar.smart"; + data = "cloonar.com"; } { name = "domain-name-servers"; @@ -209,67 +209,99 @@ { hw-address = "7a:5a:d6:d0:29:fe"; ip-address = "10.42.100.10"; - server-hostname = "home-assistant.cloonar.smart"; + server-hostname = "home-assistant.cloonar.com"; } { hw-address = "60:a4:23:97:4a:ec"; ip-address = "10.42.100.21"; - server-hostname = "shellymotionsensor-60A423974AEC.cloonar.smart"; + server-hostname = "shellymotionsensor-60A423974AEC.cloonar.com"; } { hw-address = "8c:aa:b5:61:6f:e2"; ip-address = "10.42.100.103"; - server-hostname = "ShellyBulbDuo-8CAAB5616FE2.cloonar.smart"; + server-hostname = "ShellyBulbDuo-8CAAB5616FE2.cloonar.com"; } { hw-address = "8c:aa:b5:61:6e:9e"; ip-address = "10.42.100.104"; - server-hostname = "ShellyBulbDuo-8CAAB5616E9E.cloonar.smart"; + server-hostname = "ShellyBulbDuo-8CAAB5616E9E.cloonar.com"; } { hw-address = "cc:50:e3:bc:27:64"; ip-address = "10.42.100.112"; - server-hostname = "Nuki_Bridge_1A753F72.cloonar.smart"; + server-hostname = "Nuki_Bridge_1A753F72.cloonar.com"; } { hw-address = "e8:db:84:aa:19:6d"; ip-address = "10.42.100.116"; - server-hostname = "shellybutton1-E8DB84AA196D.cloonar.smart"; + server-hostname = "shellybutton1-E8DB84AA196D.cloonar.com"; } { hw-address = "e8:db:84:a9:ea:be"; ip-address = "10.42.100.117"; - server-hostname = "ShellyBulbDuo-E8DB84A9EABE.cloonar.smart"; + server-hostname = "ShellyBulbDuo-E8DB84A9EABE.cloonar.com"; } { hw-address = "e8:db:84:a9:d1:8b"; ip-address = "10.42.100.119"; - server-hostname = "shellycolorbulb-E8DB84A9D18B.cloonar.smart"; + server-hostname = "shellycolorbulb-E8DB84A9D18B.cloonar.com"; } { hw-address = "3c:61:05:e5:96:e0"; ip-address = "10.42.100.120"; - server-hostname = "shellycolorbulb-3C6105E596E0.cloonar.smart"; + server-hostname = "shellycolorbulb-3C6105E596E0.cloonar.com"; } { hw-address = "e8:db:84:a9:d7:ef"; ip-address = "10.42.100.121"; - server-hostname = "shellycolorbulb-E8DB84A9D7EF.cloonar.smart"; + server-hostname = "shellycolorbulb-E8DB84A9D7EF.cloonar.com"; } { hw-address = "e8:db:84:aa:51:aa"; ip-address = "10.42.100.122"; - server-hostname = "shellycolorbulb-E8DB84AA51AA.cloonar.smart"; + server-hostname = "shellycolorbulb-E8DB84AA51AA.cloonar.com"; } + + { + hw-address = "34:94:54:79:bc:57"; + ip-address = "10.42.100.130"; + server-hostname = "shellycolorbulb-34945479bc57.cloonar.com"; + } + { + hw-address = "48:55:19:d9:a1:b2"; + ip-address = "10.42.100.131"; + server-hostname = "shellycolorbulb-485519d9a1b2.cloonar.com"; + } + { + hw-address = "48:55:19:d9:ae:95"; + ip-address = "10.42.100.132"; + server-hostname = "shellycolorbulb-485519d9ae95.cloonar.com"; + } + { + hw-address = "48:55:19:d9:4a:28"; + ip-address = "10.42.100.133"; + server-hostname = "shellycolorbulb-485519d94a28.cloonar.com"; + } + { + hw-address = "48:55:19:da:6b:6a"; + ip-address = "10.42.100.134"; + server-hostname = "shellycolorbulb-485519da6b6a.cloonar.com"; + } + { + hw-address = "48:55:19:d9:e0:18"; + ip-address = "10.42.100.135"; + server-hostname = "shellycolorbulb-485519d9e018.cloonar.com"; + } + { hw-address = "34:6f:24:f3:af:ad"; ip-address = "10.42.100.137"; - server-hostname = "daikin86604.cloonar.smart"; + server-hostname = "daikin86604.cloonar.com"; } { hw-address = "34:6f:24:c1:f8:54"; ip-address = "10.42.100.139"; - server-hostname = "daikin53800.cloonar.smart"; + server-hostname = "daikin53800.cloonar.com"; } ]; } diff --git a/hosts/fw.cloonar.com/modules/home-assistant/default.nix b/hosts/fw.cloonar.com/modules/home-assistant/default.nix index 2dcdf9c..2fdb848 100644 --- a/hosts/fw.cloonar.com/modules/home-assistant/default.nix +++ b/hosts/fw.cloonar.com/modules/home-assistant/default.nix @@ -154,6 +154,7 @@ in "::1" ]; }; + api = { }; history.exclude = { entities = hiddenEntities; domains = [ diff --git a/hosts/fw.cloonar.com/modules/home-assistant/light.nix b/hosts/fw.cloonar.com/modules/home-assistant/light.nix index 02416ab..7e06157 100644 --- a/hosts/fw.cloonar.com/modules/home-assistant/light.nix +++ b/hosts/fw.cloonar.com/modules/home-assistant/light.nix @@ -128,6 +128,21 @@ } ]; } + { + conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.kitchen_lights' }}" ]; + sequence = [ + { + service = "light.turn_on"; + target = { + entity_id = "light.kitchen_lights"; + }; + data = { + brightness_pct = 30; + color_temp = 450; + }; + } + ]; + } { conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and state_attr(trigger.entity_id, 'is_deconz_group') != None }}" ]; sequence = [ diff --git a/hosts/fw.cloonar.com/modules/home-assistant/locks.nix b/hosts/fw.cloonar.com/modules/home-assistant/locks.nix index 83b106f..d8a1de1 100644 --- a/hosts/fw.cloonar.com/modules/home-assistant/locks.nix +++ b/hosts/fw.cloonar.com/modules/home-assistant/locks.nix @@ -11,7 +11,7 @@ trigger = { platform = "state"; entity_id = [ - "person.dominik" + "device_tracker.dominiks_iphone" ]; from = "not_home"; to = "home"; diff --git a/hosts/fw.cloonar.com/modules/home-assistant/presence.nix b/hosts/fw.cloonar.com/modules/home-assistant/presence.nix deleted file mode 100644 index ce93305..0000000 --- a/hosts/fw.cloonar.com/modules/home-assistant/presence.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - services.home-assistant.extraComponents = [ - "mqtt_room" - "opnsense" - ]; - services.home-assistant.config = { - opnsense = { - url = "https://fw.cloonar.com/api"; - api_secret = "!secret opnsense_api_secret"; - api_key = "!secret opnsense_api_key"; - }; - sensor = [ - { - platform = "mqtt_room"; - name = "Dominiks iPhone BLE"; - device_id = "roomAssistant:d2a41d13-16bf-41fb-af4b-c520bdc7b68a"; - # device_id = "0a666fe0ccd0d587414fec9b9946168f"; - state_topic = "espresense/rooms"; - away_timeout = 30; - } - ]; - }; -} diff --git a/hosts/fw.cloonar.com/modules/openconnect.nix b/hosts/fw.cloonar.com/modules/openconnect.nix index e56f344..877563e 100644 --- a/hosts/fw.cloonar.com/modules/openconnect.nix +++ b/hosts/fw.cloonar.com/modules/openconnect.nix @@ -23,7 +23,7 @@ in systemd.services.openconnect-wrwks-keepalive = { serviceConfig.Type = "oneshot"; - path = with pkgs; [ bash ]; + path = with pkgs; [ bash inetutils ]; script = '' ping -c 2 stage.wsw.at ''; diff --git a/hosts/fw.cloonar.com/modules/unbound.nix b/hosts/fw.cloonar.com/modules/unbound.nix index 893a35f..87ed767 100644 --- a/hosts/fw.cloonar.com/modules/unbound.nix +++ b/hosts/fw.cloonar.com/modules/unbound.nix @@ -42,6 +42,13 @@ let "\"wohnpartner-wien.at IN A 10.254.240.109\"" "\"wohnberatung-wien.at IN A 10.254.240.109\"" "\"wienbautvor.at IN A 10.254.240.109\"" + "\"wienwohntbesser.at IN A 10.254.240.109\"" + "\"b.wohnservice-wien.at IN A 10.254.240.109\"" + "\"b.mieterhilfe.at IN A 10.254.240.109\"" + "\"b.wohnpartner-wien.at IN A 10.254.240.109\"" + "\"b.wohnberatung-wien.at IN A 10.254.240.109\"" + "\"b.wienbautvor.at IN A 10.254.240.109\"" + "\"b.wienwohntbesser.at IN A 10.254.240.109\"" "\"a.wohnservice-wien.at IN A 10.254.240.109\"" "\"a.wohnpartner-wien.at IN A 10.254.240.109\"" "\"a.stage.wohnservice-wien.at IN A 10.254.240.110\"" @@ -50,6 +57,12 @@ let "\"a.stage.wohnberatung-wien.at IN A 10.254.240.110\"" "\"a.stage.wienbautvor.at IN A 10.254.240.110\"" "\"a.stage.wienwohntbesser.at IN A 10.254.240.110\"" + "\"b.stage.wohnservice-wien.at IN A 10.254.240.110\"" + "\"b.stage.mieterhilfe.at IN A 10.254.240.110\"" + "\"b.stage.wohnpartner-wien.at IN A 10.254.240.110\"" + "\"b.stage.wohnberatung-wien.at IN A 10.254.240.110\"" + "\"b.stage.wienbautvor.at IN A 10.254.240.110\"" + "\"b.stage.wienwohntbesser.at IN A 10.254.240.110\"" "\"upgrade-staging.wohnservice-wien.at IN A 10.254.240.110\"" "\"upgrade-staging.mieterhilfe.at IN A 10.254.240.110\"" "\"upgrade-staging.wohnpartner-wien.at IN A 10.254.240.110\"" @@ -64,6 +77,13 @@ let "\"firetv-living.cloonar.com IN A 10.42.96.175\"" "\"ps5-living.cloonar.com IN A 10.42.96.176\"" + "\"shellycolorbulb-34945479bc57.cloonar.com IN A 10.42.100.130\"" + "\"shellycolorbulb-485519d9a1b2.cloonar.com IN A 10.42.100.131\"" + "\"shellycolorbulb-485519d9ae95.cloonar.com IN A 10.42.100.132\"" + "\"shellycolorbulb-485519d94a28.cloonar.com IN A 10.42.100.133\"" + "\"shellycolorbulb-485519da6b6a.cloonar.com IN A 10.42.100.134\"" + "\"shellycolorbulb-485519d9e018.cloonar.com IN A 10.42.100.135\"" + "\"ddl-warez.to IN A 172.67.184.30\"" ]; local-data-ptr = [ diff --git a/hosts/nb-01.cloonar.com/modules/sway/sway.nix b/hosts/nb-01.cloonar.com/modules/sway/sway.nix index 763df82..cc354bf 100644 --- a/hosts/nb-01.cloonar.com/modules/sway/sway.nix +++ b/hosts/nb-01.cloonar.com/modules/sway/sway.nix @@ -45,6 +45,7 @@ in { environment.systemPackages = with pkgs; [ alsaUtils bitwarden + brave cryptomator dbeaver dbus-sway-environment @@ -59,6 +60,7 @@ in { grim jmeter libreoffice + librewolf mako networkmanagerapplet nextcloud-client