From b4d8e87abe7254f4c446f7ae3e5b2c849a7a8d83 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Wed, 25 Mar 2026 18:35:27 +0100 Subject: [PATCH] change domain name Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com> --- home/system/hyprland/bindings.nix | 2 +- server-modules/adguardhome.nix | 2 +- server-modules/arr.nix | 18 +++++++++--------- server-modules/cloudflared.nix | 2 +- server-modules/cyberchef.nix | 2 +- server-modules/default-creds.nix | 2 +- server-modules/eleakxir.nix | 2 +- server-modules/freshrss.nix | 31 ------------------------------- server-modules/glance/default.nix | 8 ++++---- server-modules/glance/home.nix | 10 +++++----- server-modules/glance/server.nix | 30 +++++++++++++++--------------- server-modules/linkding.nix | 24 ------------------------ server-modules/mazanoke.nix | 2 +- server-modules/mealie.nix | 2 +- server-modules/ssh.nix | 2 +- server-modules/stirling-pdf.nix | 2 +- server-modules/umami.nix | 5 +++-- 17 files changed, 46 insertions(+), 100 deletions(-) delete mode 100644 server-modules/freshrss.nix delete mode 100644 server-modules/linkding.nix diff --git a/home/system/hyprland/bindings.nix b/home/system/hyprland/bindings.nix index 6f573df..ad71096 100644 --- a/home/system/hyprland/bindings.nix +++ b/home/system/hyprland/bindings.nix @@ -83,7 +83,7 @@ in { { key = "h"; desc = "Home"; - cmd = "${pkgs.brave}/bin/brave 'https://home.hadi.diy'"; + cmd = "${pkgs.brave}/bin/brave 'https://home.hadi.icu'"; } { key = "m"; diff --git a/server-modules/adguardhome.nix b/server-modules/adguardhome.nix index d64df92..d5703c1 100644 --- a/server-modules/adguardhome.nix +++ b/server-modules/adguardhome.nix @@ -11,5 +11,5 @@ allowedUDPPorts = [53]; }; - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."adguard.hadi.diy" = "http://localhost:${toString config.services.adguardhome.port}"; + services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."adguard.hadi.icu" = "http://localhost:${toString config.services.adguardhome.port}"; } diff --git a/server-modules/arr.nix b/server-modules/arr.nix index 760e71e..869dcf2 100644 --- a/server-modules/arr.nix +++ b/server-modules/arr.nix @@ -52,14 +52,14 @@ in { users.users.jellyfin.extraGroups = ["video" "render"]; - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress = { - "media.hadi.diy" = "http://localhost:8096"; - "demandemedia.hadi.diy" = "http://localhost:5055"; - "bazarr.hadi.diy" = "http://localhost:6767"; - "prowlarr.hadi.diy" = "http://localhost:9696"; - "radarr.hadi.diy" = "http://localhost:7878"; - "sonarr.hadi.diy" = "http://localhost:8989"; - "transmission.hadi.diy" = "http://localhost:9091"; - "readarr.hadi.diy" = "http://localhost:8787"; + services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = { + "media.hadi.icu" = "http://localhost:8096"; + "demandemedia.hadi.icu" = "http://localhost:5055"; + "bazarr.hadi.icu" = "http://localhost:6767"; + "prowlarr.hadi.icu" = "http://localhost:9696"; + "radarr.hadi.icu" = "http://localhost:7878"; + "sonarr.hadi.icu" = "http://localhost:8989"; + "transmission.hadi.icu" = "http://localhost:9091"; + "readarr.hadi.icu" = "http://localhost:8787"; }; } diff --git a/server-modules/cloudflared.nix b/server-modules/cloudflared.nix index bc70a18..063344b 100644 --- a/server-modules/cloudflared.nix +++ b/server-modules/cloudflared.nix @@ -14,7 +14,7 @@ # This will create a credentials file & give you the tunnel ID to use below. services.cloudflared = { enable = true; - tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73" = { + tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3" = { credentialsFile = config.sops.secrets."cloudflared-token".path; default = "http_status:404"; }; diff --git a/server-modules/cyberchef.nix b/server-modules/cyberchef.nix index e84ae94..b71c371 100644 --- a/server-modules/cyberchef.nix +++ b/server-modules/cyberchef.nix @@ -10,6 +10,6 @@ } ]; }; - cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."cyberchef.hadi.diy" = "http://localhost:8754"; + cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."cyberchef.hadi.icu" = "http://localhost:8754"; }; } diff --git a/server-modules/default-creds.nix b/server-modules/default-creds.nix index 3f59d33..1708f98 100644 --- a/server-modules/default-creds.nix +++ b/server-modules/default-creds.nix @@ -4,5 +4,5 @@ port = 8087; }; - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."default-creds.hadi.diy" = "http://localhost:${toString config.services.default-creds.port}"; + services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."default-creds.hadi.icu" = "http://localhost:${toString config.services.default-creds.port}"; } diff --git a/server-modules/eleakxir.nix b/server-modules/eleakxir.nix index c1b445d..7f28886 100644 --- a/server-modules/eleakxir.nix +++ b/server-modules/eleakxir.nix @@ -22,5 +22,5 @@ inputs.eleakxir.packages.${pkgs.stdenv.hostPlatform.system}.leak-utils ]; - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."eleakxir-back.hadi.diy" = "http://localhost:${toString config.services.eleakxir.port}"; + services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."eleakxir-back.hadi.icu" = "http://localhost:${toString config.services.eleakxir.port}"; } diff --git a/server-modules/freshrss.nix b/server-modules/freshrss.nix deleted file mode 100644 index 2dab2f6..0000000 --- a/server-modules/freshrss.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - pkgs, - config, - ... -}: let - user = config.var.username; -in { - sops.secrets = { - freshrss = { - owner = "freshrss"; - mode = "0600"; - }; - }; - - services.freshrss = { - enable = true; - defaultUser = user; - passwordFile = config.sops.secrets.freshrss.path; - user = "freshrss"; - baseUrl = "https://rss.hadi.diy"; - webserver = "nginx"; - - extensions = with pkgs.freshrss-extensions; [ - youtube - title-wrap - reading-time - ]; - }; - - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."rss.hadi.diy" = "http://localhost:80"; -} diff --git a/server-modules/glance/default.nix b/server-modules/glance/default.nix index 8d75bbf..53dab96 100644 --- a/server-modules/glance/default.nix +++ b/server-modules/glance/default.nix @@ -14,10 +14,10 @@ server.port = 5678; }; }; - cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress = { - "start.hadi.diy" = "http://localhost:8755"; - "home.hadi.diy" = "http://localhost:8755"; - "glance.hadi.diy" = "http://localhost:8755"; + cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress = { + "start.hadi.icu" = "http://localhost:8755"; + "home.hadi.icu" = "http://localhost:8755"; + "glance.hadi.icu" = "http://localhost:8755"; }; nginx.virtualHosts."glance.local" = { diff --git a/server-modules/glance/home.nix b/server-modules/glance/home.nix index 2d175df..289ede9 100644 --- a/server-modules/glance/home.nix +++ b/server-modules/glance/home.nix @@ -58,7 +58,7 @@ links = [ { title = "Linkding"; - url = "https://linkding.hadi.diy"; + url = "https://linkding.hadi.icu"; } { title = "Mail"; @@ -101,11 +101,11 @@ } { title = "Mazanoke (image downgrading)"; - url = "https://mazanoke.hadi.diy"; + url = "https://mazanoke.hadi.icu"; } { title = "Stirling PDF"; - url = "https://pdf.hadi.diy"; + url = "https://pdf.hadi.icu"; } { title = "Vert (file converter)"; @@ -204,11 +204,11 @@ links = [ { title = "Nix 4 Cyber"; - url = "https://n4c.hadi.diy"; + url = "https://n4c.hadi.icu"; } { title = "Cyberchef"; - url = "https://cyberchef.hadi.diy"; + url = "https://cyberchef.hadi.icu"; } { title = "TryHackMe"; diff --git a/server-modules/glance/server.nix b/server-modules/glance/server.nix index 7d6e09a..1d0822e 100644 --- a/server-modules/glance/server.nix +++ b/server-modules/glance/server.nix @@ -26,37 +26,37 @@ sites = [ { title = "Adguard"; - url = "https://adguard.hadi.diy"; + url = "https://adguard.hadi.icu"; icon = "si:adguard"; } { title = "Mealie"; - url = "https://mealie.hadi.diy"; + url = "https://mealie.hadi.icu"; icon = "si:mealie"; } { title = "Linkding"; - url = "https://linkding.hadi.diy"; + url = "https://linkding.hadi.icu"; icon = "sh:linkding"; } { title = "Mazanoke"; - url = "https://mazanoke.hadi.diy"; + url = "https://mazanoke.hadi.icu"; icon = "sh:mazanoke"; } { title = "Stirling PDF"; - url = "https://pdf.hadi.diy"; + url = "https://pdf.hadi.icu"; icon = "sh:stirling-pdf"; } { title = "Eleakxir"; - url = "https://eleakxir.hadi.diy"; + url = "https://eleakxir.hadi.icu"; icon = "si:elixir"; } { title = "Cyberchef"; - url = "https://cyberchef.hadi.diy"; + url = "https://cyberchef.hadi.icu"; icon = "si:codechef"; } ]; @@ -68,42 +68,42 @@ sites = [ { title = "Jellyfin"; - url = "https://media.hadi.diy"; + url = "https://media.hadi.icu"; icon = "si:jellyfin"; } { title = "Jellyseerr"; - url = "https://demandemedia.hadi.diy"; + url = "https://demandemedia.hadi.icu"; icon = "si:odysee"; } { title = "Radarr"; - url = "https://radarr.hadi.diy"; + url = "https://radarr.hadi.icu"; icon = "si:radarr"; } { title = "Sonarr"; - url = "https://sonarr.hadi.diy"; + url = "https://sonarr.hadi.icu"; icon = "si:sonarr"; } { title = "Readarr"; - url = "https://readarr.hadi.diy"; + url = "https://readarr.hadi.icu"; icon = "si:bookstack"; } { title = "Bazarr"; - url = "https://bazarr.hadi.diy"; + url = "https://bazarr.hadi.icu"; icon = "si:subtitleedit"; } { title = "Prowlarr"; - url = "https://prowlarr.hadi.diy"; + url = "https://prowlarr.hadi.icu"; icon = "si:podcastindex"; } { title = "Transmission"; - url = "https://transmission.hadi.diy"; + url = "https://transmission.hadi.icu"; icon = "si:transmission"; } ]; diff --git a/server-modules/linkding.nix b/server-modules/linkding.nix deleted file mode 100644 index ebd9476..0000000 --- a/server-modules/linkding.nix +++ /dev/null @@ -1,24 +0,0 @@ -# Linkding is a self-hosted bookmark manager -{...}: let - port = 9090; -in { - virtualisation.oci-containers.containers.linkding = { - autoStart = true; - image = "sissbruecker/linkding@sha256:6d4fcc50bee8ee054ad2dfebbc41217f325398b907aff7ec011996c6a5ec17c9"; - volumes = ["/var/lib/linkding/data:/etc/linkding/data"]; - ports = ["${builtins.toString port}:${builtins.toString port}"]; - }; - - # Ensure our mount point exists - systemd.tmpfiles.settings."10-linkding" = { - "/var/lib/linkding/data" = { - d = { - mode = "0755"; - user = "root"; - group = "root"; - }; - }; - }; - - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."linkding.hadi.diy" = "http://localhost:${toString port}"; -} diff --git a/server-modules/mazanoke.nix b/server-modules/mazanoke.nix index bb0ab34..4aff26b 100644 --- a/server-modules/mazanoke.nix +++ b/server-modules/mazanoke.nix @@ -30,6 +30,6 @@ in { } ]; }; - cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."mazanoke.hadi.diy" = "http://localhost:8755"; + cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."mazanoke.hadi.icu" = "http://localhost:8755"; }; } diff --git a/server-modules/mealie.nix b/server-modules/mealie.nix index 054307f..a398430 100644 --- a/server-modules/mealie.nix +++ b/server-modules/mealie.nix @@ -5,5 +5,5 @@ port = 8092; }; - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."mealie.hadi.diy" = "http://localhost:${toString config.services.mealie.port}"; + services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."mealie.hadi.icu" = "http://localhost:${toString config.services.mealie.port}"; } diff --git a/server-modules/ssh.nix b/server-modules/ssh.nix index d9ec325..361305b 100644 --- a/server-modules/ssh.nix +++ b/server-modules/ssh.nix @@ -18,5 +18,5 @@ in { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPG9SE80ZyBcXZK/f5ypSKudaM5Jo3XtQikCnGo0jI5E hadi@nixy" ]; - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."ssh.hadi.diy" = "ssh://localhost:22"; + services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."ssh.hadi.icu" = "ssh://localhost:22"; } diff --git a/server-modules/stirling-pdf.nix b/server-modules/stirling-pdf.nix index 4215a37..458854b 100644 --- a/server-modules/stirling-pdf.nix +++ b/server-modules/stirling-pdf.nix @@ -5,5 +5,5 @@ environment."SERVER_PORT" = "8083"; }; - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."pdf.hadi.diy" = "http://localhost:${toString config.services.stirling-pdf.environment.SERVER_PORT}"; + services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."pdf.hadi.icu" = "http://localhost:${toString config.services.stirling-pdf.environment.SERVER_PORT}"; } diff --git a/server-modules/umami.nix b/server-modules/umami.nix index 80a1f4c..f282041 100644 --- a/server-modules/umami.nix +++ b/server-modules/umami.nix @@ -13,9 +13,10 @@ DISABLE_BOT_CHECK = true; }; }; - services.cloudflared.tunnels."f7c8f777-a36c-4b9a-b6e3-6a112bd43e73".ingress."umami.hadi.diy" = "http://localhost:${toString config.services.umami.settings.PORT}"; + services.cloudflared.tunnels."a1dfa315-7fc3-4a65-8c02-8387932c35c3".ingress."umami.hadi.icu" = "http://localhost:${toString config.services.umami.settings.PORT}"; systemd.services.default-creds.environment = { - PUBLIC_UMAMI_URL = "https://umami.hadi.diy"; + PUBLIC_UMAMI_URL = "https://umami.hadi.icu"; + # FIXME: PUBLIC_UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08"; UMAMI_URL = "http://localhost:8097"; UMAMI_WEBSITE_ID = "7197484c-01ad-488e-9caa-5ab7b7595f08";