From 055603e4037667d57a460e51bc76f4f26e192b3e Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Thu, 17 Apr 2025 01:52:33 -0600 Subject: [PATCH] url adjustments for migrated servers --- modules/servers/homepage/layout.nix | 4 ++-- modules/servers/homepage/services.nix | 4 +--- modules/servers/multi-scrobbler.nix | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/servers/homepage/layout.nix b/modules/servers/homepage/layout.nix index 3b9060c..7d010be 100644 --- a/modules/servers/homepage/layout.nix +++ b/modules/servers/homepage/layout.nix @@ -14,7 +14,7 @@ header = false; tab = "servers"; style = "row"; - columns = 4; + columns = 3; }; piracy = { header = false; @@ -26,7 +26,7 @@ header = false; tab = "servers"; style = "row"; - columns = 3; + columns = 2; }; "server bookmarks" = { header = false; diff --git a/modules/servers/homepage/services.nix b/modules/servers/homepage/services.nix index f0b171f..37e7f9a 100644 --- a/modules/servers/homepage/services.nix +++ b/modules/servers/homepage/services.nix @@ -12,7 +12,6 @@ in { multimedia = [ { inherit (services) plex; } - { inherit (services) jellyfin; } { inherit (services) audiobookshelf; } { inherit (services) kavita; } ]; @@ -26,12 +25,11 @@ in { inherit (services) prowlarr; } { inherit (services) sabnzbd; } { inherit (services) "qbittorrent server"; } - { inherit (services) "qbittorrent miniserver"; } ]; } { main = [ - { inherit (services) nextcloud; } + # { inherit (services) nextcloud; } { inherit (services) mealie; } { inherit (services) paperless; } ]; diff --git a/modules/servers/multi-scrobbler.nix b/modules/servers/multi-scrobbler.nix index b9cb1ed..2406d97 100644 --- a/modules/servers/multi-scrobbler.nix +++ b/modules/servers/multi-scrobbler.nix @@ -2,6 +2,7 @@ let cfg = config.my.servers.multi-scrobbler; setup = import ./setup.nix { inherit lib config; }; + servers = config.my.servers; in { options.my.servers.multi-scrobbler = setup.mkOptions "multi-scrobbler" "scrobble" 9078; @@ -18,9 +19,8 @@ in PGID = toString config.users.groups.users.gid; BASE_URL = cfg.url; DEEZER_REDIRECT_URI = "http://${config.my.ips.${cfg.hostName}}:${toString cfg.port}/deezer/callback"; - MALOJA_URL = "http://192.168.1.100:42010"; - JELLYFIN_URL = "http://192.168.1.69:8096"; - PLEX_URL = "http://192.168.1.69:32400"; + MALOJA_URL = servers.maloja.local; + PLEX_URL = servers.plex.local; WS_ENABLE = "true"; }; volumes = [ "${config.my.containerData}/multi-scrobbler:/config" ];