From 6217871960a8e9fc93f9d122e8159ca11777d256 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 8 Feb 2025 13:01:16 -0500 Subject: [PATCH] hostnames move --- .../nixos/modules/nmasur/presets/services/actualbudget.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/arr.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/bind.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/calibre-web.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/filebrowser.nix | 2 +- .../modules/nmasur/presets/services/gitea-runner-local.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/gitea.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/grafana.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/immich.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/influxdb2.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/jellyfin.nix | 2 +- .../nixos/modules/nmasur/presets/services/minecraft-server.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/n8n.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/nextcloud.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/ntfy-sh.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/paperless.nix | 2 +- .../modules/nmasur/presets/services/prometheus-remote-write.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/thelounge.nix | 2 +- .../nixos/modules/nmasur/presets/services/transmission.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/uptime-kuma.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/vaultwarden.nix | 2 +- .../nixos/modules/nmasur/presets/services/victoriametrics.nix | 2 +- platforms/nixos/modules/nmasur/presets/services/vm-agent.nix | 2 +- platforms/nixos/modules/services/filebrowser.nix | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/platforms/nixos/modules/nmasur/presets/services/actualbudget.nix b/platforms/nixos/modules/nmasur/presets/services/actualbudget.nix index 6537bcc..1e15e23 100644 --- a/platforms/nixos/modules/nmasur/presets/services/actualbudget.nix +++ b/platforms/nixos/modules/nmasur/presets/services/actualbudget.nix @@ -6,7 +6,7 @@ let cfg = config.nmasur.presets.services.actualbudget; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/arr.nix b/platforms/nixos/modules/nmasur/presets/services/arr.nix index f77abed..9f2a75a 100644 --- a/platforms/nixos/modules/nmasur/presets/services/arr.nix +++ b/platforms/nixos/modules/nmasur/presets/services/arr.nix @@ -8,7 +8,7 @@ let cfg = config.nmasur.presets.services.actualbudget; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; # This config specifies ports for Prometheus to scrape information arrConfig = { diff --git a/platforms/nixos/modules/nmasur/presets/services/bind.nix b/platforms/nixos/modules/nmasur/presets/services/bind.nix index 5531b96..865c82d 100644 --- a/platforms/nixos/modules/nmasur/presets/services/bind.nix +++ b/platforms/nixos/modules/nmasur/presets/services/bind.nix @@ -14,7 +14,7 @@ let cfg = config.nmasur.presets.services.bind; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; localIp = "192.168.1.218"; localServices = [ diff --git a/platforms/nixos/modules/nmasur/presets/services/calibre-web.nix b/platforms/nixos/modules/nmasur/presets/services/calibre-web.nix index 5f0481b..fd7e412 100644 --- a/platforms/nixos/modules/nmasur/presets/services/calibre-web.nix +++ b/platforms/nixos/modules/nmasur/presets/services/calibre-web.nix @@ -14,7 +14,7 @@ let cfg = config.nmasur.presets.services.calibre-web; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; libraryPath = "/data/books"; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/filebrowser.nix b/platforms/nixos/modules/nmasur/presets/services/filebrowser.nix index 7e3c308..3aba1c7 100644 --- a/platforms/nixos/modules/nmasur/presets/services/filebrowser.nix +++ b/platforms/nixos/modules/nmasur/presets/services/filebrowser.nix @@ -5,7 +5,7 @@ }: let cfg = config.nmasur.presets.services.filebrowser; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/gitea-runner-local.nix b/platforms/nixos/modules/nmasur/presets/services/gitea-runner-local.nix index 40ddf05..c5e9404 100644 --- a/platforms/nixos/modules/nmasur/presets/services/gitea-runner-local.nix +++ b/platforms/nixos/modules/nmasur/presets/services/gitea-runner-local.nix @@ -13,7 +13,7 @@ let cfg = config.nmasur.presets.services.gitea-runner-local; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/gitea.nix b/platforms/nixos/modules/nmasur/presets/services/gitea.nix index 0227ebb..4da3318 100644 --- a/platforms/nixos/modules/nmasur/presets/services/gitea.nix +++ b/platforms/nixos/modules/nmasur/presets/services/gitea.nix @@ -7,7 +7,7 @@ let cfg = config.nmasur.presets.services.gitea; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; giteaPath = "/var/lib/gitea"; # Default service directory in { diff --git a/platforms/nixos/modules/nmasur/presets/services/grafana.nix b/platforms/nixos/modules/nmasur/presets/services/grafana.nix index a9c6dca..1de653c 100644 --- a/platforms/nixos/modules/nmasur/presets/services/grafana.nix +++ b/platforms/nixos/modules/nmasur/presets/services/grafana.nix @@ -7,7 +7,7 @@ let cfg = config.nmasur.presets.services.grafana; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; promUid = "victoriametrics"; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/immich.nix b/platforms/nixos/modules/nmasur/presets/services/immich.nix index 0730201..6d7a0b7 100644 --- a/platforms/nixos/modules/nmasur/presets/services/immich.nix +++ b/platforms/nixos/modules/nmasur/presets/services/immich.nix @@ -2,7 +2,7 @@ let cfg = config.nmasur.presets.services.immich; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/influxdb2.nix b/platforms/nixos/modules/nmasur/presets/services/influxdb2.nix index ce1e602..d71e066 100644 --- a/platforms/nixos/modules/nmasur/presets/services/influxdb2.nix +++ b/platforms/nixos/modules/nmasur/presets/services/influxdb2.nix @@ -7,7 +7,7 @@ let cfg = config.nmasur.presets.services.influxdb2; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/jellyfin.nix b/platforms/nixos/modules/nmasur/presets/services/jellyfin.nix index 44e67f9..858678c 100644 --- a/platforms/nixos/modules/nmasur/presets/services/jellyfin.nix +++ b/platforms/nixos/modules/nmasur/presets/services/jellyfin.nix @@ -10,7 +10,7 @@ let cfg = config.nmasur.presets.services.jellyfin; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/minecraft-server.nix b/platforms/nixos/modules/nmasur/presets/services/minecraft-server.nix index 0ae79fc..923e205 100644 --- a/platforms/nixos/modules/nmasur/presets/services/minecraft-server.nix +++ b/platforms/nixos/modules/nmasur/presets/services/minecraft-server.nix @@ -7,7 +7,7 @@ let cfg = config.nmasur.presets.services.minecraft-server; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; localPort = 25564; publicPort = 49732; rconPort = 25575; diff --git a/platforms/nixos/modules/nmasur/presets/services/n8n.nix b/platforms/nixos/modules/nmasur/presets/services/n8n.nix index 829b52a..91d362d 100644 --- a/platforms/nixos/modules/nmasur/presets/services/n8n.nix +++ b/platforms/nixos/modules/nmasur/presets/services/n8n.nix @@ -5,7 +5,7 @@ let cfg = config.nmasur.presets.services.n8n; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/nextcloud.nix b/platforms/nixos/modules/nmasur/presets/services/nextcloud.nix index 14f73b7..bb0b574 100644 --- a/platforms/nixos/modules/nmasur/presets/services/nextcloud.nix +++ b/platforms/nixos/modules/nmasur/presets/services/nextcloud.nix @@ -7,7 +7,7 @@ let cfg = config.nmasur.presets.services.nextcloud; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/ntfy-sh.nix b/platforms/nixos/modules/nmasur/presets/services/ntfy-sh.nix index 6a8bb15..d2fd300 100644 --- a/platforms/nixos/modules/nmasur/presets/services/ntfy-sh.nix +++ b/platforms/nixos/modules/nmasur/presets/services/ntfy-sh.nix @@ -2,7 +2,7 @@ let cfg = config.nmasur.presets.services.ntfy-sh; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/paperless.nix b/platforms/nixos/modules/nmasur/presets/services/paperless.nix index 9ba0272..50e4c08 100644 --- a/platforms/nixos/modules/nmasur/presets/services/paperless.nix +++ b/platforms/nixos/modules/nmasur/presets/services/paperless.nix @@ -4,7 +4,7 @@ let cfg = config.nmasur.presets.services.paperless; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/prometheus-remote-write.nix b/platforms/nixos/modules/nmasur/presets/services/prometheus-remote-write.nix index ff9c3ce..ab91151 100644 --- a/platforms/nixos/modules/nmasur/presets/services/prometheus-remote-write.nix +++ b/platforms/nixos/modules/nmasur/presets/services/prometheus-remote-write.nix @@ -12,7 +12,7 @@ let cfg = config.nmasur.presets.services.prometheus-remote-write; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/thelounge.nix b/platforms/nixos/modules/nmasur/presets/services/thelounge.nix index 0f6e010..18e5873 100644 --- a/platforms/nixos/modules/nmasur/presets/services/thelounge.nix +++ b/platforms/nixos/modules/nmasur/presets/services/thelounge.nix @@ -1,7 +1,7 @@ { config, lib, ... }: let cfg = config.nmasur.presets.services.thelounge; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/transmission.nix b/platforms/nixos/modules/nmasur/presets/services/transmission.nix index 6cca6b9..adaebf7 100644 --- a/platforms/nixos/modules/nmasur/presets/services/transmission.nix +++ b/platforms/nixos/modules/nmasur/presets/services/transmission.nix @@ -10,7 +10,7 @@ let cfg = config.nmasur.presets.services.transmission; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/uptime-kuma.nix b/platforms/nixos/modules/nmasur/presets/services/uptime-kuma.nix index a997259..f6ed574 100644 --- a/platforms/nixos/modules/nmasur/presets/services/uptime-kuma.nix +++ b/platforms/nixos/modules/nmasur/presets/services/uptime-kuma.nix @@ -2,7 +2,7 @@ let cfg = config.nmasur.presets.services.uptime-kuma; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; in { diff --git a/platforms/nixos/modules/nmasur/presets/services/vaultwarden.nix b/platforms/nixos/modules/nmasur/presets/services/vaultwarden.nix index c115919..d04f3de 100644 --- a/platforms/nixos/modules/nmasur/presets/services/vaultwarden.nix +++ b/platforms/nixos/modules/nmasur/presets/services/vaultwarden.nix @@ -11,7 +11,7 @@ let cfg = config.nmasur.presets.services.vaultwarden; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; vaultwardenPath = "/var/lib/bitwarden_rs"; # Default service directory in { diff --git a/platforms/nixos/modules/nmasur/presets/services/victoriametrics.nix b/platforms/nixos/modules/nmasur/presets/services/victoriametrics.nix index 724d824..0baebc3 100644 --- a/platforms/nixos/modules/nmasur/presets/services/victoriametrics.nix +++ b/platforms/nixos/modules/nmasur/presets/services/victoriametrics.nix @@ -11,7 +11,7 @@ let cfg = config.nmasur.presets.services.victoriametrics; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; username = "prometheus"; diff --git a/platforms/nixos/modules/nmasur/presets/services/vm-agent.nix b/platforms/nixos/modules/nmasur/presets/services/vm-agent.nix index 2ed8877..6786909 100644 --- a/platforms/nixos/modules/nmasur/presets/services/vm-agent.nix +++ b/platforms/nixos/modules/nmasur/presets/services/vm-agent.nix @@ -11,7 +11,7 @@ let cfg = config.nmasur.presets.services.vm-agent; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; username = "prometheus"; diff --git a/platforms/nixos/modules/services/filebrowser.nix b/platforms/nixos/modules/services/filebrowser.nix index cba68dd..d05020b 100644 --- a/platforms/nixos/modules/services/filebrowser.nix +++ b/platforms/nixos/modules/services/filebrowser.nix @@ -6,7 +6,7 @@ }: let cfg = config.services.filebrowser; - hostnames = config.nmasur.settings.hostnames; + inherit (config.nmasur.settings) hostnames; dataDir = "/var/lib/filebrowser";