From 634171e91d68cff2bbe3b1ce99ff7a2337c802bf Mon Sep 17 00:00:00 2001 From: martyTF Date: Thu, 14 May 2026 00:09:24 +0200 Subject: [PATCH] moving server from old config to new one (finally) --- modules/device/server.nix | 63 ++++++++++++++++++++++++++++++- modules/server/media/jellyfin.nix | 4 +- modules/server/misc/lauti.nix | 10 ++--- 3 files changed, 68 insertions(+), 9 deletions(-) diff --git a/modules/device/server.nix b/modules/device/server.nix index 2085aba..1908981 100644 --- a/modules/device/server.nix +++ b/modules/device/server.nix @@ -6,5 +6,66 @@ }: { - config = { }; + config = { + server = { + arr = { + enable = true; + }; + cloud = { + immich = { + enable = true; + public = true; + }; + nextcloud = { + enable = true; + public = true; + }; + }; + media = { + jellyfin = { + enable = true; + public = false; + }; + jellyseer = { + enable = true; + public = false; + }; + kavita = { + enable = true; + public = false; + }; + navidrome = { + enable = true; + public = false; + }; + }; + misc = { + dawarich = { + enable = true; + public = false; + }; + forgejo = { + enable = true; + public = true; + }; + lauti = { + enable = true; + public = true; + }; + vaultwarden = { + enable = true; + public = true; + }; + }; + social = { + gotosocial = { + enable = true; + public = true; + }; + synapse = { + enable = true; + }; + }; + }; + }; } diff --git a/modules/server/media/jellyfin.nix b/modules/server/media/jellyfin.nix index 67c4eab..a9e5b23 100644 --- a/modules/server/media/jellyfin.nix +++ b/modules/server/media/jellyfin.nix @@ -6,9 +6,9 @@ }: { - options.server = { + options.server.media = { jellyfin = { - enable = lib.mkEnableOption "enable jelyfin"; + enable = lib.mkEnableOption "enable jellyfin"; port = lib.mkOption { default = 8096; description = "set jellyfin port"; diff --git a/modules/server/misc/lauti.nix b/modules/server/misc/lauti.nix index 8606f0a..5ba0bd5 100644 --- a/modules/server/misc/lauti.nix +++ b/modules/server/misc/lauti.nix @@ -4,9 +4,7 @@ pkgs, ... }: -let - domain = "${config.server.misc.lauti.subdomain}.${config.networking.domain}"; -in + { options = { server.misc.lauti = { @@ -17,7 +15,7 @@ in }; public = lib.mkEnableOption "make lauti public"; domain = lib.mkOption { - default = ""; + default = "calendar"; description = "lauti domain"; }; subdomain = lib.mkOption { @@ -32,7 +30,7 @@ in enable = config.server.misc.lauti.enable; settings = { LAUTI_ADMIN_EMAIL = "lauti@${config.networking.domain}"; - LAUTI_BASE_URL = "https://${domain}"; + LAUTI_BASE_URL = "https://${config.server.misc.lauti.subdomain}.${config.networking.domain}"; LAUTI_OSM_TILE_CACHE_DIR = "/var/lib/lauti/osm"; LAUTI_OSM_TILE_SERVER = "https://tile.openstreetmap.org/{z}/{x}/{y}.png"; LAUTI_TIMEZONE = "Europe/Berlin"; @@ -42,7 +40,7 @@ in }; nginx = { virtualHosts = { - "${domain}" = + "${config.server.misc.lauti.subdomain}.${config.networking.domain}" = if config.server.misc.lauti.public then { enableACME = true;