From a48aba7824d25d736ab874460b7105c73c23afa4 Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Wed, 30 Jul 2025 17:17:51 +0530
Subject: [PATCH] feat: Added stuff

---
 darwin/shiro/services/default.nix       |  2 --
 darwin/shiro/services/jellyfin.nix      | 13 -----------
 nixos/deoxys/services/default.nix       |  4 +---
 nixos/deoxys/services/homeassistant.nix | 28 ----------------------
 nixos/mirai/services/default.nix        |  1 -
 nixos/mirai/services/jellyfin.nix       | 13 -----------
 nixos/tsuba/services/homeassistant.nix  | 31 +++++++++++++++++++++++++
 nixos/tsuba/services/jellyfin.nix       |  4 ++++
 8 files changed, 36 insertions(+), 60 deletions(-)
 delete mode 100644 darwin/shiro/services/jellyfin.nix
 delete mode 100644 nixos/deoxys/services/homeassistant.nix
 delete mode 100644 nixos/mirai/services/jellyfin.nix

diff --git a/darwin/shiro/services/default.nix b/darwin/shiro/services/default.nix
index ca85d92c..5ffabad5 100644
--- a/darwin/shiro/services/default.nix
+++ b/darwin/shiro/services/default.nix
@@ -5,9 +5,7 @@
     ./tailscale.nix
     ./autossh.nix
     ./colima.nix
-    # ./homeassistant.nix
     # ./zerotier.nix
-    # ./jellyfin.nix
     # ./aerospace.nix
   ];
 }
diff --git a/darwin/shiro/services/jellyfin.nix b/darwin/shiro/services/jellyfin.nix
deleted file mode 100644
index 2adeaabf..00000000
--- a/darwin/shiro/services/jellyfin.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{...}: {
-  imports = [../../../modules/macos/jellyfin.nix];
-  # services = {
-  #   jellyfin = {
-  #     enable = true;
-  #   };
-  #   # caddy = {
-  #   #   virtualHosts."media.darksailor.dev".extraConfig = ''
-  #   #     reverse_proxy localhost:8096
-  #   #   '';
-  #   # };
-  # };
-}
diff --git a/nixos/deoxys/services/default.nix b/nixos/deoxys/services/default.nix
index e1bd169e..d854dccb 100644
--- a/nixos/deoxys/services/default.nix
+++ b/nixos/deoxys/services/default.nix
@@ -1,5 +1,3 @@
 {...}: {
-  imports = [
-    ./homeassistant.nix
-  ];
+  imports = [];
 }
diff --git a/nixos/deoxys/services/homeassistant.nix b/nixos/deoxys/services/homeassistant.nix
deleted file mode 100644
index 61eebcc6..00000000
--- a/nixos/deoxys/services/homeassistant.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  environment.systemPackages = [pkgs.arion pkgs.docker-client];
-  virtualisation.docker.enable = lib.mkForce false;
-  virtualisation.podman.enable = true;
-  virtualisation.podman.dockerSocket.enable = true;
-  users.extraUsers.servius.extraGroups = ["podman"];
-  networking.firewall.allowedTCPPorts = [21063 21064];
-  networking.firewall.allowedUDPPorts = [5353];
-
-  virtualisation.arion = {
-    backend = "docker";
-    projects = {
-      homeassistant.settings.services = {
-        homeassistant = {
-          service.image = "ghcr.io/home-assistant/home-assistant:stable";
-          service.volumes = ["/etc/localtime:/etc/localtime:ro" "/run/dbus:/run/dbus:ro"];
-          service.privileged = true;
-          service.network_mode = "host";
-          service.restart = "unless-stopped";
-        };
-      };
-    };
-  };
-}
diff --git a/nixos/mirai/services/default.nix b/nixos/mirai/services/default.nix
index da0b6566..fa8f098d 100644
--- a/nixos/mirai/services/default.nix
+++ b/nixos/mirai/services/default.nix
@@ -18,7 +18,6 @@
     ./searxng.nix
     ./tailscale.nix
 
-    # ./jellyfin.nix
     # ./ldap.nix
     # ./llama.nix
     # ./navidrome.nix
diff --git a/nixos/mirai/services/jellyfin.nix b/nixos/mirai/services/jellyfin.nix
deleted file mode 100644
index 68f69aed..00000000
--- a/nixos/mirai/services/jellyfin.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{...}: {
-  services = {
-    jellyfin = {
-      enable = false;
-      openFirewall = false;
-    };
-    caddy = {
-      virtualHosts."media.darksailor.dev".extraConfig = ''
-        reverse_proxy localhost:8096
-      '';
-    };
-  };
-}
diff --git a/nixos/tsuba/services/homeassistant.nix b/nixos/tsuba/services/homeassistant.nix
index eebfa988..a5368f7d 100644
--- a/nixos/tsuba/services/homeassistant.nix
+++ b/nixos/tsuba/services/homeassistant.nix
@@ -1,8 +1,39 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: {
+  virtualisation.oci-containers = {
+    containers = {
+      homeassistant = {
+        image = "ghcr.io/home-assistant/home-assistant:stable";
+        volumes = [
+          "/var/lib/homeassistant:/config"
+          "/etc/localtime:/etc/localtime:ro"
+          "/run/dbus:/run/dbus:ro"
+        ];
+        privileged = true;
+        extraOptions = [
+          "--network=host"
+        ];
+        environment = {
+          PUID = toString config.users.users.homeassistant.uid;
+          PGID = toString config.users.groups.homeassistant.gid;
+          TZ = config.time.timeZone;
+        };
+      };
+    };
+  };
+  users.users.homeassistant = {
+    isSystemUser = true;
+    home = "/var/lib/homeassistant";
+    createHome = true;
+    group = "homeassistant";
+  };
+  users.extraUsers.homeassistant.extraGroups = ["media"];
+  users.groups.homeassistant = {};
+
   services.caddy = {
     virtualHosts."home.darksailor.dev".extraConfig = ''
       import hetzner
diff --git a/nixos/tsuba/services/jellyfin.nix b/nixos/tsuba/services/jellyfin.nix
index b290ceaa..8c3955d7 100644
--- a/nixos/tsuba/services/jellyfin.nix
+++ b/nixos/tsuba/services/jellyfin.nix
@@ -40,6 +40,10 @@
         import hetzner
         reverse_proxy localhost:8096
       '';
+      virtualHosts."media.darksailor.dev".extraConfig = ''
+        import hetzner
+        reverse_proxy localhost:8096
+      '';
     };
   };
 }