From 625335b52867643f712497d6f369bca73b192ecf Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Thu, 29 May 2025 01:26:26 +0200
Subject: [PATCH 1/3] homeassistant: add some neat things

---
 systems/aarch64-linux/nixberry/default.nix | 33 ++++++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/systems/aarch64-linux/nixberry/default.nix b/systems/aarch64-linux/nixberry/default.nix
index 28eaa2e..f92c46b 100644
--- a/systems/aarch64-linux/nixberry/default.nix
+++ b/systems/aarch64-linux/nixberry/default.nix
@@ -60,6 +60,7 @@ in
     };
     firewall = {
       allowedTCPPorts = [
+        443
         53
         80
       ];
@@ -117,8 +118,8 @@ in
   };
 
   systemd.tmpfiles.rules = [
-    "C+ /var/lib/hass/custom_components/tuya_vacuum_maps - - - - ${inputs.tuya-vaccum-maps}/custom_components/tuya_vacuum_maps"
-    "Z /var/lib/hass/custom_components 770 hass hass - -"
+    # "C+ /var/lib/hass/custom_components/tuya_vacuum_maps - - - - ${inputs.tuya-vaccum-maps}/custom_components/tuya_vacuum_maps"
+    # "Z /var/lib/hass/custom_components 770 hass hass - -"
     "f ${config.services.home-assistant.configDir}/automations.yaml 0755 hass hass"
   ];
 
@@ -133,10 +134,10 @@ in
       "met"
       "esphome"
       "rpi_power"
+      "tuya"
     ];
 
     customComponents = with pkgs.home-assistant-custom-components; [
-      tuya_local
       smartthinq-sensors
       sleep_as_android
     ];
@@ -148,6 +149,9 @@ in
 
     customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [
       mushroom
+      bubble-card
+      clock-weather-card
+      vacuum-card
     ];
 
     config = {
@@ -156,11 +160,34 @@ in
         longitude = 8.6;
         temperature_unit = "C";
         unit_system = "metric";
+
+        external_url = "https://ha.christophhollizeck.dev";
+        internal_url = "http://192.168.178.2:8123";
       };
 
       mobile_app = "";
+      recorder = "";
 
       lovelace = {
+        # mode = "yaml";
+        resources = [
+          {
+            url = "/local/nixos-lovelace-modules/vacuum-card.js";
+            type = "module";
+          }
+          {
+            url = "/local/nixos-lovelace-modules/bubble-card.js";
+            type = "module";
+          }
+          {
+            url = "/local/nixos-lovelace-modules/clock-weather-card.js";
+            type = "module";
+          }
+          {
+            url = "/local/nixos-lovelace-modules/mushroom.js";
+            type = "module";
+          }
+        ];
       };
 
       http = {

From eb00ccda713539b74609855fcf34638760ab2ad9 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Thu, 29 May 2025 01:27:08 +0200
Subject: [PATCH 2/3] discord: vesktop stopped working

---
 modules/nixos/desktop/hyprland/default.nix         | 2 +-
 systems/x86_64-linux/yggdrasil/hyprland_config.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix
index 4581f20..56811e5 100644
--- a/modules/nixos/desktop/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -172,7 +172,7 @@ in
                 "systemctl --user start hyprpolkitagent"
 
                 "[workspace 2 silent] steam --disable-gpu-compositing" # nvidia pls let me have nice things
-                "[workspace 8 silent] vesktop"
+                "[workspace 8 silent] discord"
                 "[workspace 9 silent] ELECTRON_OZONE_PLATFORM_HINT=x11 1password" # fix for promts not showing up anymore
                 "[workspace 1 silent] zen-beta"
 
diff --git a/systems/x86_64-linux/yggdrasil/hyprland_config.nix b/systems/x86_64-linux/yggdrasil/hyprland_config.nix
index 93ba5c3..1927ec1 100644
--- a/systems/x86_64-linux/yggdrasil/hyprland_config.nix
+++ b/systems/x86_64-linux/yggdrasil/hyprland_config.nix
@@ -41,7 +41,7 @@ in
 
     windowrulev2 = [
       "workspace 8 silent, class:^(steam)$, title:^(Friends List)"
-      "workspace 8 silent, class:^(vesktop)$, title:^(Discord)"
+      "workspace 8 silent, class:^(discord)$, title:^(Discord)"
       "workspace 7 silent, class:^(com.obsproject.Studio)$"
     ];
   };

From bb2c8dfb708d56d97c355049f647725b3b68b54e Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Thu, 29 May 2025 01:27:45 +0200
Subject: [PATCH 3/3] factorio-headless: make it more error resistant since
 pymod crashed multiple times

---
 modules/nixos/services/factorio-server/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/nixos/services/factorio-server/default.nix b/modules/nixos/services/factorio-server/default.nix
index 2ab4fd2..1a79690 100644
--- a/modules/nixos/services/factorio-server/default.nix
+++ b/modules/nixos/services/factorio-server/default.nix
@@ -65,8 +65,9 @@ in
       public = true;
       lan = true;
       nonBlockingSaving = true;
-      autosave-interval = 15;
+      autosave-interval = 5;
       saveName = "Pyanodons";
+      loadLatestSave = true;
       admins = [
         "daholli"
         "galbrain"