diff --git a/hosts/fw.cloonar.com/configuration.nix b/hosts/fw.cloonar.com/configuration.nix index a972b3a..d1f79a5 100644 --- a/hosts/fw.cloonar.com/configuration.nix +++ b/hosts/fw.cloonar.com/configuration.nix @@ -80,6 +80,14 @@ options = "--delete-older-than 60d"; }; + services.auto-cpufreq.enable = true; + services.auto-cpufreq.settings = { + charger = { + governor = "powersave"; + turbo = "auto"; + }; + }; + boot.tmp.cleanOnBoot = true; zramSwap.enable = true; networking.hostName = "fw"; diff --git a/hosts/fw.cloonar.com/modules/dhcp4.nix b/hosts/fw.cloonar.com/modules/dhcp4.nix index 4004939..8a3a2f7 100644 --- a/hosts/fw.cloonar.com/modules/dhcp4.nix +++ b/hosts/fw.cloonar.com/modules/dhcp4.nix @@ -115,6 +115,11 @@ name = "domain-name-servers"; data = "10.42.101.1"; } + { + name = "capwap-ac-v4"; + code = 138; + data = "10.42.97.2"; + } ]; reservations = [ ]; diff --git a/hosts/fw.cloonar.com/modules/firewall.nix b/hosts/fw.cloonar.com/modules/firewall.nix index 62ca733..7e2748b 100644 --- a/hosts/fw.cloonar.com/modules/firewall.nix +++ b/hosts/fw.cloonar.com/modules/firewall.nix @@ -88,7 +88,7 @@ # TODO: disable wan when finished iifname { "lan", "server", "vserver", "wg_cloonar" } oifname { "lan", "vb-*", "server", "vserver", "infrastructure", "multimedia", "smart", "wg_cloonar" } counter accept iifname { "lan", "server", "wg_cloonar" } oifname { "wrwks", "wg_epicenter", "wg_ghetto_at" } counter accept - iifname { "infrastructure" } oifname { "server", "vserver" } counter accept + iifname { "infrastructure" } oifname { "server", "vserver" } log prefix "Infrastructure connection: " accept iifname { "lan", "wan" } udp dport { 8211, 27015 } counter accept comment "palworld" # accept palword server diff --git a/hosts/fw.cloonar.com/modules/home-assistant/default.nix b/hosts/fw.cloonar.com/modules/home-assistant/default.nix index 93e82dc..a260747 100644 --- a/hosts/fw.cloonar.com/modules/home-assistant/default.nix +++ b/hosts/fw.cloonar.com/modules/home-assistant/default.nix @@ -128,6 +128,7 @@ in "androidtv" "rainbird" "zha" + "tplink_omada" ]; services.home-assistant.config = diff --git a/hosts/fw.cloonar.com/modules/home-assistant/enocean.nix b/hosts/fw.cloonar.com/modules/home-assistant/enocean.nix index e637036..200a5de 100644 --- a/hosts/fw.cloonar.com/modules/home-assistant/enocean.nix +++ b/hosts/fw.cloonar.com/modules/home-assistant/enocean.nix @@ -7,6 +7,13 @@ name = "enocean_switch_pc"; } ]; - logger.logs."homeassistant.components.enocean" = "debug"; + sensor = [ + { + name = "Bathroom HT"; + platform = "enocean"; + id = [ 5 41 146 251 ]; + device_class = "temperature"; + } + ]; }; } diff --git a/hosts/fw.cloonar.com/modules/home-assistant/light.nix b/hosts/fw.cloonar.com/modules/home-assistant/light.nix index 2ab5f44..c7a4802 100644 --- a/hosts/fw.cloonar.com/modules/home-assistant/light.nix +++ b/hosts/fw.cloonar.com/modules/home-assistant/light.nix @@ -71,13 +71,16 @@ { conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.toilett_lights' }}" ]; sequence = [ + { + delay = 10; + } { service = "light.turn_on"; target = { entity_id = "{{ trigger.entity_id }}"; }; data = { - brightness_pct = 30; + brightness_pct = 10; color_temp = 450; }; } @@ -86,6 +89,9 @@ { conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.hallway_lights' }}" ]; sequence = [ + { + delay = 10; + } { service = "light.turn_on"; target = { @@ -101,6 +107,9 @@ { conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.bathroom_lights' }}" ]; sequence = [ + { + delay = 10; + } { service = "light.turn_on"; target = { @@ -116,6 +125,9 @@ { conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.livingroom_lights' }}" ]; sequence = [ + { + delay = 10; + } { service = "light.turn_on"; target = { @@ -131,6 +143,9 @@ { conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.bedroom_lights' }}" ]; sequence = [ + { + delay = 10; + } { service = "light.turn_on"; target = { @@ -146,6 +161,9 @@ { conditions = [ "{{ state_attr('sun.sun', 'elevation') < 5 and trigger.entity_id == 'light.kitchen_lights' }}" ]; sequence = [ + { + delay = 10; + } { service = "light.turn_on"; target = { @@ -161,6 +179,9 @@ { conditions = [ "{{ state_attr('sun.sun', 'elevation') > 4 }}" ]; sequence = [ + { + delay = 10; + } { service = "light.turn_on"; target = { diff --git a/hosts/fw.cloonar.com/modules/home-assistant/sleep.nix b/hosts/fw.cloonar.com/modules/home-assistant/sleep.nix index d12c25a..a67cd11 100644 --- a/hosts/fw.cloonar.com/modules/home-assistant/sleep.nix +++ b/hosts/fw.cloonar.com/modules/home-assistant/sleep.nix @@ -7,12 +7,23 @@ platform = "time"; at = "input_datetime.wakeup"; }; - action = { - service_template = "switch.turn_on"; - data_template = { + action = [ + { + service = "switch.turn_on"; entity_id = "switch.coffee"; - }; - }; + } + { + delay = 1700; + } + { + service = "switch.turn_on"; + entity_id = "switch.78_8c_b5_fe_41_62_port_2_poe"; # livingroom + } + { + service = "switch.turn_on"; + entity_id = "switch.78_8c_b5_fe_41_62_port_3_poe"; # garden + } + ]; }; "automation sleep" = { alias = "sleep"; @@ -44,12 +55,16 @@ entity_id = "all"; } { - service = "light.turn_on"; - entity_id = "light.bedroom_bed"; + service = "switch.turn_off"; + entity_id = "switch.coffee"; } { service = "switch.turn_off"; - entity_id = "switch.coffee"; + entity_id = "switch.78_8c_b5_fe_41_62_port_2_poe"; + } + { + service = "switch.turn_off"; + entity_id = "switch.78_8c_b5_fe_41_62_port_3_poe"; } ]; } diff --git a/hosts/fw.cloonar.com/modules/omada.nix b/hosts/fw.cloonar.com/modules/omada.nix index bd72f5a..72c0bea 100644 --- a/hosts/fw.cloonar.com/modules/omada.nix +++ b/hosts/fw.cloonar.com/modules/omada.nix @@ -13,7 +13,7 @@ oci-containers.containers = { omada = { autoStart = true; - image = "mbentley/omada-controller:5.9"; + image = "mbentley/omada-controller:5.14.26.1"; volumes = [ "/var/lib/omada/data:/opt/tplink/EAPController/data" "/var/lib/omada/logs:/opt/tplink/EAPController/logs" diff --git a/hosts/fw.cloonar.com/modules/unbound.nix b/hosts/fw.cloonar.com/modules/unbound.nix index 13424c5..370c3ca 100644 --- a/hosts/fw.cloonar.com/modules/unbound.nix +++ b/hosts/fw.cloonar.com/modules/unbound.nix @@ -97,6 +97,10 @@ let "\"shellyrgbw2-bedroom-1.cloonar.smart IN A 10.42.100.36\"" "\"shellyrgbw2-bedroom-2.cloonar.smart IN A 10.42.100.37\"" "\"shellyrgbw2-bedroom-3.cloonar.smart IN A 10.42.100.38\"" + "\"shellycolorbulb-bedroom-1.cloonar.smart IN A 10.42.100.39\"" + "\"shellycolorbulb-bedroom-2.cloonar.smart IN A 10.42.100.40\"" + "\"shellycolorbulb-bedroom-3.cloonar.smart IN A 10.42.100.41\"" + "\"shellycolorbulb-bedroom-4.cloonar.smart IN A 10.42.100.42\"" # bath "\"shellyswitch25-bath-1.cloonar.smart IN A 10.42.100.49\"" "\"shellybulbduo-bath-1.cloonar.smart IN A 10.42.100.50\"" @@ -142,6 +146,13 @@ let # ssl-upstream = "yes"; }; forward-zone = [ + { + name = "local.ghetto.at."; + forward-tls-upstream = "no"; + forward-addr = [ + "10.43.97.1" + ]; + } { name = "ghetto.at.local."; forward-tls-upstream = "no"; @@ -181,14 +192,9 @@ let name = "."; forward-tls-upstream = "yes"; forward-first = "no"; - # forward-addr = "104.16.248.249@853#cloudflare-dns.com"; forward-addr = [ "9.9.9.9@853#dns9.quad9.net" "149.112.112.11@853#dns11.quad9.net" - # "9.9.9.9@853" - # "149.112.112.11@853" - # "9.9.9.9" - # "149.112.112.11" ]; } ]; diff --git a/hosts/nb-new.cloonar.com/modules/sway/sway.nix b/hosts/nb-new.cloonar.com/modules/sway/sway.nix index b5424e9..d275eae 100644 --- a/hosts/nb-new.cloonar.com/modules/sway/sway.nix +++ b/hosts/nb-new.cloonar.com/modules/sway/sway.nix @@ -72,6 +72,7 @@ in { # unstable.cura freecad openscad + orca-slicer (unstable.where-is-my-sddm-theme.override { themeConfig.General = { diff --git a/hosts/nb-new.cloonar.com/modules/sway/waybar.conf b/hosts/nb-new.cloonar.com/modules/sway/waybar.conf index 7fcc983..9fb4d81 100644 --- a/hosts/nb-new.cloonar.com/modules/sway/waybar.conf +++ b/hosts/nb-new.cloonar.com/modules/sway/waybar.conf @@ -146,7 +146,7 @@ "disk": { "interval": 5, "format": " {percentage_used:2}%", - "path": "/home/" + "path": "/nix/" }, "tray": { "icon-size": 20 diff --git a/hosts/nb-new.cloonar.com/users/configs/project_history b/hosts/nb-new.cloonar.com/users/configs/project_history index ac6fc36..fb5bf77 100644 --- a/hosts/nb-new.cloonar.com/users/configs/project_history +++ b/hosts/nb-new.cloonar.com/users/configs/project_history @@ -10,9 +10,7 @@ /home/dominik/projects/cloonar/amz/amz-api /home/dominik/projects/cloonar/amz/amz-frontend /home/dominik/projects/myhidden.life/myhidden.life-web -/home/dominik/projects/socialgrow.tech/sgt-user-management -/home/dominik/projects/socialgrow.tech/sgt-payment-gateway -/home/dominik/projects/socialgrow.tech/sgt-reddit-account-shop +/home/dominik/projects/socialgrow.tech/sgt-api /home/dominik/projects/epicenter.works/campaigntool /home/dominik/projects/epicenter.works/epicenter.works /home/dominik/projects/epicenter.works/epicenter-nixos diff --git a/hosts/nb-new.cloonar.com/users/dominik.nix b/hosts/nb-new.cloonar.com/users/dominik.nix index 0c6da30..c16d6ce 100644 --- a/hosts/nb-new.cloonar.com/users/dominik.nix +++ b/hosts/nb-new.cloonar.com/users/dominik.nix @@ -347,9 +347,7 @@ in git clone gitea@git.cloonar.com:Cloonar/amz-frontend.git /nix/persist/user/dominik/projects/cloonar/amz/amz-frontend 2>/dev/null git clone gitea@git.cloonar.com:myhidden.life/web.git /nix/persist/user/dominik/projects/myhidden.life/myhidden.life-web 2>/dev/null - git clone gitea@git.cloonar.com:socialgrow.tech/user-management.git /nix/persist/user/dominik/projects/socialgrow.tech/sgt-user-management 2>/dev/null - git clone gitea@git.cloonar.com:socialgrow.tech/payment-gateway.git /nix/persist/user/dominik/projects/socialgrow.tech/sgt-payment-gateway 2>/dev/null - git clone gitea@git.cloonar.com:socialgrow.tech/reddit-account-shop.git /nix/persist/user/dominik/projects/socialgrow.tech/sgt-reddit-account-shop 2>/dev/null + git clone gitea@git.cloonar.com:socialgrow.tech/sgt-api.git /nix/persist/user/dominik/projects/socialgrow.tech/sgt-api 2>/dev/null ssh-keygen -R gitlab.epicenter.works ssh-keyscan gitlab.epicenter.works >> ~/.ssh/known_hosts