diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 52c84f6..aed360c 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -13,30 +13,9 @@ # Special udev rule for google's coral tpu skyg.nixos.server.udevrules.coraltpu.enable = true; - # Containers - virtualisation.oci-containers = { - containers = { - scrypted = { - autoStart = true; - image = "ghcr.io/koush/scrypted"; - extraOptions = [ "--network=host" ]; - volumes = [ - "/var/run/dbus:/var/run/dbus" - "/var/run/avahi-daemon/socket:/var/run/avahi-daemon/socket" - "/opt/homelab/scrypted/db:/server/volume" - "/mnt/EightTerra/NVR:/nvr" - ]; - environment = { - SCRYPTED_NVR_VOLUME = "/nvr"; - }; - }; - }; - }; - # K8s - services.kubernetes.kubelet.hostname = "minipc2.lab.internal"; - skyg.nixos.server.k8s = { - enable = true; - isNode = true; + # Services + skyg.nixos.server.services = { + scrypted.enable = true; }; } diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 91d2440..e76037c 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -11,6 +11,8 @@ let 20048 # ssh 22 + # prometheus + 9090 ]; in { diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index 74fd8b8..d542631 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -1,11 +1,8 @@ { ... }: { imports = [ - ./audiobookshelf.nix ./coral-tpu-udev.nix ./exporters.nix - ./ai-services.nix - ./jellyfin.nix ./admin.nix ./arrs ./k8s diff --git a/modules/nixos/server/ai-services.nix b/modules/nixos/server/services/ai-services.nix similarity index 100% rename from modules/nixos/server/ai-services.nix rename to modules/nixos/server/services/ai-services.nix diff --git a/modules/nixos/server/audiobookshelf.nix b/modules/nixos/server/services/audiobookshelf.nix similarity index 100% rename from modules/nixos/server/audiobookshelf.nix rename to modules/nixos/server/services/audiobookshelf.nix diff --git a/modules/nixos/server/services/default.nix b/modules/nixos/server/services/default.nix new file mode 100644 index 0000000..a84388b --- /dev/null +++ b/modules/nixos/server/services/default.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + imports = [ + ./audiobookshelf.nix + ./ai-services.nix + ./jellyfin.nix + ]; +} diff --git a/modules/nixos/server/jellyfin.nix b/modules/nixos/server/services/jellyfin.nix similarity index 100% rename from modules/nixos/server/jellyfin.nix rename to modules/nixos/server/services/jellyfin.nix diff --git a/modules/nixos/server/services/scrypted.nix b/modules/nixos/server/services/scrypted.nix new file mode 100644 index 0000000..8020a66 --- /dev/null +++ b/modules/nixos/server/services/scrypted.nix @@ -0,0 +1,34 @@ +{ config, lib, ... }: + +let + cfg = config.skyg.nixos.server.services.scrypted; +in +{ + options = { + skyg.nixos.server.services.scrypted = { + enable = lib.mkEnableOption + "Enable Scrypted"; + }; + }; + + config = lib.mkIf cfg.enable { + virtualisation.oci-containers = { + containers = { + scrypted = { + autoStart = true; + image = "ghcr.io/koush/scrypted"; + extraOptions = [ "--network=host" ]; + volumes = [ + "/var/run/dbus:/var/run/dbus" + "/var/run/avahi-daemon/socket:/var/run/avahi-daemon/socket" + "/opt/homelab/scrypted/db:/server/volume" + "/mnt/EightTerra/NVR:/nvr" + ]; + environment = { + SCRYPTED_NVR_VOLUME = "/nvr"; + }; + }; + }; + }; + }; +}