From b2ee04dce5aa9cc2a429bd252be1927b39067e22 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Mon, 14 Oct 2024 19:21:07 -0500
Subject: [PATCH] added more hass config

---
 enviroments/common/default.nix | 17 ++++++++++++++++-
 enviroments/server/default.nix | 16 +++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/enviroments/common/default.nix b/enviroments/common/default.nix
index 3416c1a..db170db 100644
--- a/enviroments/common/default.nix
+++ b/enviroments/common/default.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   imports = [
     ../../users
   ];
@@ -76,6 +80,12 @@
         group = "pihole";
         isSystemUser = true;
       };
+
+      hass = {
+        uid = lib.mkForce 2004;
+        group = "hass";
+        isSystemUser = true;
+      };
     };
 
     groups = {
@@ -118,6 +128,11 @@
         gid = 2003;
         members = ["pihole" "leyla"];
       };
+
+      hass = {
+        gid = lib.mkForce 2004;
+        members = ["hass" "leyla"];
+      };
     };
   };
 
diff --git a/enviroments/server/default.nix b/enviroments/server/default.nix
index f2f32bf..c3e6464 100644
--- a/enviroments/server/default.nix
+++ b/enviroments/server/default.nix
@@ -137,12 +137,13 @@
     systemd = {
       tmpfiles.rules = [
         "d /home/jellyfin 755 jellyfin jellyfin -"
-        "d /home/jellyfin/media 775 jellyfin jellyfin_media -"
-        "d /home/jellyfin/config 750 jellyfin jellyfin -"
-        "d /home/jellyfin/cache 755 jellyfin jellyfin_media -"
+        "d /home/jellyfin/media 775 jellyfin jellyfin_media -" # is /home/docker/jellyfin/media on existing server
+        "d /home/jellyfin/config 750 jellyfin jellyfin -" # is /home/docker/jellyfin/config on existing server
+        "d /home/jellyfin/cache 755 jellyfin jellyfin_media -" # is /home/docker/jellyfin/cache on existing server
         "d /home/forgejo 750 forgejo forgejo -"
-        "d /home/forgejo/data 750 forgejo forgejo -"
-        "d /home/pihole 750 pihole pihole -"
+        "d /home/forgejo/data 750 forgejo forgejo -" # is /home/docker/forgejo on existing server
+        "d /home/pihole 750 pihole pihole -" # is /home/docker/pihole on old system
+        "d /home/hass 750 hass hass -" # is /home/docker/hass on old system
       ];
 
       services = {
@@ -243,8 +244,8 @@
         enable = true;
         user = "jellyfin";
         group = "jellyfin";
-        dataDir = "/home/jellyfin/config"; # location on existing server: /home/docker/jellyfin/config
-        cacheDir = "/home/jellyfin/cache"; # location on existing server: /home/docker/jellyfin/cache
+        dataDir = "/home/jellyfin/config";
+        cacheDir = "/home/jellyfin/cache";
       };
 
       forgejo = {
@@ -263,6 +264,7 @@
 
       home-assistant = {
         enable = true;
+        configDir = "/home/hass";
         config.http = {
           server_port = 8082;
           use_x_forwarded_for = true;