feat: Added stuff

darwin/shiro/services/default.nix

@@ -5,9 +5,7 @@
     ./tailscale.nix
     ./autossh.nix
     ./colima.nix
-    # ./homeassistant.nix
     # ./zerotier.nix
-    # ./jellyfin.nix
     # ./aerospace.nix
   ];
 }

darwin/shiro/services/jellyfin.nix

@@ -1,13 +0,0 @@
-{...}: {
-  imports = [../../../modules/macos/jellyfin.nix];
-  # services = {
-  #   jellyfin = {
-  #     enable = true;
-  #   };
-  #   # caddy = {
-  #   #   virtualHosts."media.darksailor.dev".extraConfig = ''
-  #   #     reverse_proxy localhost:8096
-  #   #   '';
-  #   # };
-  # };
-}

nixos/deoxys/services/default.nix

@@ -1,5 +1,3 @@
 {...}: {
-  imports = [
-    ./homeassistant.nix
-  ];
+  imports = [];
 }

nixos/deoxys/services/homeassistant.nix

@@ -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";
-        };
-      };
-    };
-  };
-}

nixos/mirai/services/default.nix

@@ -18,7 +18,6 @@
     ./searxng.nix
     ./tailscale.nix
 
-    # ./jellyfin.nix
     # ./ldap.nix
     # ./llama.nix
     # ./navidrome.nix

nixos/mirai/services/jellyfin.nix

@@ -1,13 +0,0 @@
-{...}: {
-  services = {
-    jellyfin = {
-      enable = false;
-      openFirewall = false;
-    };
-    caddy = {
-      virtualHosts."media.darksailor.dev".extraConfig = ''
-        reverse_proxy localhost:8096
-      '';
-    };
-  };
-}

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

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
+      '';
     };
   };
 }