diff --git a/.github/README.md b/.github/README.md index f269ced..06f1f98 100644 --- a/.github/README.md +++ b/.github/README.md @@ -109,7 +109,8 @@
Click here for a summary of my infrastructure -topology +topology + ### Programs diff --git a/SwarselSystems.org b/SwarselSystems.org index 145192c..7fb59b1 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -2704,11 +2704,11 @@ Another note concerning [[https://flake.parts/][flake-parts]]: services = { ollama = { name = "Ollama"; - icon = "${self}/files/topology-images/ollama.png"; + icon = "services.ollama"; }; openwebui = { name = "Open WebUI"; - icon = "${self}/files/topology-images/openwebui.png"; + icon = "services.open-webui"; }; comfyui = { name = "Comfy UI"; @@ -13130,7 +13130,10 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin mpv ]; - topology.self.services.${serviceName}.info = "http://localhost:${builtins.toString servicePort}"; + topology.self.services.${serviceName} = { + info = "http://localhost:${builtins.toString servicePort}"; + icon = lib.mkForce "${self}/files/topology-images/mpd.png"; + }; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { directories = [{ directory = "/var/lib/${serviceName}"; user = "mpd"; group = "mpd"; }]; @@ -16799,7 +16802,7 @@ Deployment notes: - finally, disable new user registration in web ui #+begin_src nix-ts :tangle modules/nixos/server/slink.nix -{ self, lib, config, dns, globals, confLib, ... }: +{ lib, config, dns, globals, confLib, ... }: let inherit (confLib.gen { name = "slink"; port = 3000; dir = "/var/lib/slink"; }) servicePort serviceName serviceDomain serviceDir serviceAddress proxyAddress4 proxyAddress6; inherit (confLib.static) isHome isProxied webProxy homeWebProxy dnsServer homeProxyIf webProxyIf homeServiceAddress nginxAccessRules; @@ -16858,7 +16861,7 @@ in topology.self.services.${serviceName} = { name = lib.swarselsystems.toCapitalized serviceName; info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/shlink.png"; + icon = "services.not-available"; }; globals = { @@ -37541,7 +37544,8 @@ Here lies defined the readme for GitHub and Forgejo:
Click here for a summary of my infrastructure - topology + topology + ### Programs diff --git a/files/topology-images/DELL-C2665dnf.png b/files/topology-images/DELL-C2665dnf.png index 798595a..aeb3c33 100644 Binary files a/files/topology-images/DELL-C2665dnf.png and b/files/topology-images/DELL-C2665dnf.png differ diff --git a/files/topology-images/TL-SG1005D.png b/files/topology-images/TL-SG1005D.png index c06f063..2c1b087 100644 Binary files a/files/topology-images/TL-SG1005D.png and b/files/topology-images/TL-SG1005D.png differ diff --git a/files/topology-images/TL-SG108.png b/files/topology-images/TL-SG108.png index 3088ba8..b44ff23 100644 Binary files a/files/topology-images/TL-SG108.png and b/files/topology-images/TL-SG108.png differ diff --git a/files/topology-images/ankisync.png b/files/topology-images/ankisync.png index 3a4432c..7a04a66 100644 Binary files a/files/topology-images/ankisync.png and b/files/topology-images/ankisync.png differ diff --git a/files/topology-images/comfyui.png b/files/topology-images/comfyui.png index 88f1191..7261308 100644 Binary files a/files/topology-images/comfyui.png and b/files/topology-images/comfyui.png differ diff --git a/files/topology-images/croc.png b/files/topology-images/croc.png index 1024fe0..ef233de 100644 Binary files a/files/topology-images/croc.png and b/files/topology-images/croc.png differ diff --git a/files/topology-images/dgxos.png b/files/topology-images/dgxos.png index d593fc3..888913c 100644 Binary files a/files/topology-images/dgxos.png and b/files/topology-images/dgxos.png differ diff --git a/files/topology-images/dovecot.png b/files/topology-images/dovecot.png index 16e35fa..a5b0c46 100644 Binary files a/files/topology-images/dovecot.png and b/files/topology-images/dovecot.png differ diff --git a/files/topology-images/ender3.png b/files/topology-images/ender3.png index 16db113..5dc154b 100644 Binary files a/files/topology-images/ender3.png and b/files/topology-images/ender3.png differ diff --git a/files/topology-images/firefly-iii.png b/files/topology-images/firefly-iii.png index de09e5e..499dd6e 100644 Binary files a/files/topology-images/firefly-iii.png and b/files/topology-images/firefly-iii.png differ diff --git a/files/topology-images/firezone.png b/files/topology-images/firezone.png index fbbbf67..c250fb3 100644 Binary files a/files/topology-images/firezone.png and b/files/topology-images/firezone.png differ diff --git a/files/topology-images/freshrss.png b/files/topology-images/freshrss.png index d1a7511..64f0ec2 100644 Binary files a/files/topology-images/freshrss.png and b/files/topology-images/freshrss.png differ diff --git a/files/topology-images/garage.png b/files/topology-images/garage.png index 50306cf..99122ed 100644 Binary files a/files/topology-images/garage.png and b/files/topology-images/garage.png differ diff --git a/files/topology-images/home-manager.png b/files/topology-images/home-manager.png index 8ff9258..e473fd9 100644 Binary files a/files/topology-images/home-manager.png and b/files/topology-images/home-manager.png differ diff --git a/files/topology-images/homebox.png b/files/topology-images/homebox.png index c4728f9..b10934b 100644 Binary files a/files/topology-images/homebox.png and b/files/topology-images/homebox.png differ diff --git a/files/topology-images/huawei.png b/files/topology-images/huawei.png index 20fd367..d579a73 100644 Binary files a/files/topology-images/huawei.png and b/files/topology-images/huawei.png differ diff --git a/files/topology-images/hunsn.png b/files/topology-images/hunsn.png index d011117..4b6c464 100644 Binary files a/files/topology-images/hunsn.png and b/files/topology-images/hunsn.png differ diff --git a/files/topology-images/kavita.png b/files/topology-images/kavita.png deleted file mode 100644 index dc1cd45..0000000 Binary files a/files/topology-images/kavita.png and /dev/null differ diff --git a/files/topology-images/kea.png b/files/topology-images/kea.png index 9e68bcd..e8571a8 100644 Binary files a/files/topology-images/kea.png and b/files/topology-images/kea.png differ diff --git a/files/topology-images/mac.png b/files/topology-images/mac.png index 6c82ebc..9832b0e 100644 Binary files a/files/topology-images/mac.png and b/files/topology-images/mac.png differ diff --git a/files/topology-images/matrix.png b/files/topology-images/matrix.png deleted file mode 100644 index b20366d..0000000 Binary files a/files/topology-images/matrix.png and /dev/null differ diff --git a/files/topology-images/mautrix.png b/files/topology-images/mautrix.png index a68f624..fdb3d77 100644 Binary files a/files/topology-images/mautrix.png and b/files/topology-images/mautrix.png differ diff --git a/files/topology-images/microbin.png b/files/topology-images/microbin.png index da0c331..22dbd24 100644 Binary files a/files/topology-images/microbin.png and b/files/topology-images/microbin.png differ diff --git a/files/topology-images/minecraft.png b/files/topology-images/minecraft.png index a9690b9..74e03c6 100644 Binary files a/files/topology-images/minecraft.png and b/files/topology-images/minecraft.png differ diff --git a/files/topology-images/mpd.png b/files/topology-images/mpd.png index d8b6d96..6be7e4c 100644 Binary files a/files/topology-images/mpd.png and b/files/topology-images/mpd.png differ diff --git a/files/topology-images/nintendo-switch.png b/files/topology-images/nintendo-switch.png index b42d542..ace0e3a 100644 Binary files a/files/topology-images/nintendo-switch.png and b/files/topology-images/nintendo-switch.png differ diff --git a/files/topology-images/nsd.png b/files/topology-images/nsd.png index 4a76c8f..553a8d1 100644 Binary files a/files/topology-images/nsd.png and b/files/topology-images/nsd.png differ diff --git a/files/topology-images/octoprint.png b/files/topology-images/octoprint.png index a8ce6fb..29d75b1 100644 Binary files a/files/topology-images/octoprint.png and b/files/topology-images/octoprint.png differ diff --git a/files/topology-images/ollama.png b/files/topology-images/ollama.png index 8c2d452..33dfbb9 100644 Binary files a/files/topology-images/ollama.png and b/files/topology-images/ollama.png differ diff --git a/files/topology-images/openwebui.png b/files/topology-images/openwebui.png index a158087..477adeb 100644 Binary files a/files/topology-images/openwebui.png and b/files/topology-images/openwebui.png differ diff --git a/files/topology-images/pc.png b/files/topology-images/pc.png index b8fa044..9216357 100644 Binary files a/files/topology-images/pc.png and b/files/topology-images/pc.png differ diff --git a/files/topology-images/phone.png b/files/topology-images/phone.png index bde15e7..9519d53 100644 Binary files a/files/topology-images/phone.png and b/files/topology-images/phone.png differ diff --git a/files/topology-images/postfix.png b/files/topology-images/postfix.png index c809b0f..3faad71 100644 Binary files a/files/topology-images/postfix.png and b/files/topology-images/postfix.png differ diff --git a/files/topology-images/postgresql.png b/files/topology-images/postgresql.png deleted file mode 100644 index d7843b5..0000000 Binary files a/files/topology-images/postgresql.png and /dev/null differ diff --git a/files/topology-images/ps4.png b/files/topology-images/ps4.png index 2054540..caff4c5 100644 Binary files a/files/topology-images/ps4.png and b/files/topology-images/ps4.png differ diff --git a/files/topology-images/raspi.png b/files/topology-images/raspi.png index 884f8bb..e165f23 100644 Binary files a/files/topology-images/raspi.png and b/files/topology-images/raspi.png differ diff --git a/files/topology-images/readarr.png b/files/topology-images/readarr.png index 2ce0639..22fdabc 100644 Binary files a/files/topology-images/readarr.png and b/files/topology-images/readarr.png differ diff --git a/files/topology-images/roundcube.png b/files/topology-images/roundcube.png index 014dc92..0f6d83b 100644 Binary files a/files/topology-images/roundcube.png and b/files/topology-images/roundcube.png differ diff --git a/files/topology-images/rspamd.png b/files/topology-images/rspamd.png index 8bf4c12..7c9c12c 100644 Binary files a/files/topology-images/rspamd.png and b/files/topology-images/rspamd.png differ diff --git a/files/topology-images/shlink.png b/files/topology-images/shlink.png index e3df864..8b75b23 100644 Binary files a/files/topology-images/shlink.png and b/files/topology-images/shlink.png differ diff --git a/files/topology-images/tp_link_tl-sg108e.jpg b/files/topology-images/tp_link_tl-sg108e.jpg index ea8826c..19ee29d 100644 Binary files a/files/topology-images/tp_link_tl-sg108e.jpg and b/files/topology-images/tp_link_tl-sg108e.jpg differ diff --git a/files/topology-images/windows.png b/files/topology-images/windows.png index c16d05f..b879ccf 100644 Binary files a/files/topology-images/windows.png and b/files/topology-images/windows.png differ diff --git a/files/topology-images/zflip6.png b/files/topology-images/zflip6.png index 5e2b59f..9ec40e0 100644 Binary files a/files/topology-images/zflip6.png and b/files/topology-images/zflip6.png differ diff --git a/files/topology/topology.png b/files/topology/topology.png index 6960555..55f6d0b 100644 Binary files a/files/topology/topology.png and b/files/topology/topology.png differ diff --git a/files/topology/topology_small.png b/files/topology/topology_small.png index d1663db..12977b8 100644 Binary files a/files/topology/topology_small.png and b/files/topology/topology_small.png differ diff --git a/modules/nixos/server/mpd.nix b/modules/nixos/server/mpd.nix index 7fcbed0..8339d46 100644 --- a/modules/nixos/server/mpd.nix +++ b/modules/nixos/server/mpd.nix @@ -30,7 +30,10 @@ in mpv ]; - topology.self.services.${serviceName}.info = "http://localhost:${builtins.toString servicePort}"; + topology.self.services.${serviceName} = { + info = "http://localhost:${builtins.toString servicePort}"; + icon = lib.mkForce "${self}/files/topology-images/mpd.png"; + }; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { directories = [{ directory = "/var/lib/${serviceName}"; user = "mpd"; group = "mpd"; }]; diff --git a/modules/nixos/server/slink.nix b/modules/nixos/server/slink.nix index 398f099..8f0309f 100644 --- a/modules/nixos/server/slink.nix +++ b/modules/nixos/server/slink.nix @@ -1,4 +1,4 @@ -{ self, lib, config, dns, globals, confLib, ... }: +{ lib, config, dns, globals, confLib, ... }: let inherit (confLib.gen { name = "slink"; port = 3000; dir = "/var/lib/slink"; }) servicePort serviceName serviceDomain serviceDir serviceAddress proxyAddress4 proxyAddress6; inherit (confLib.static) isHome isProxied webProxy homeWebProxy dnsServer homeProxyIf webProxyIf homeServiceAddress nginxAccessRules; @@ -57,7 +57,7 @@ in topology.self.services.${serviceName} = { name = lib.swarselsystems.toCapitalized serviceName; info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/shlink.png"; + icon = "services.not-available"; }; globals = { diff --git a/nix/topology.nix b/nix/topology.nix index 909fd31..7e80e3d 100644 --- a/nix/topology.nix +++ b/nix/topology.nix @@ -234,11 +234,11 @@ services = { ollama = { name = "Ollama"; - icon = "${self}/files/topology-images/ollama.png"; + icon = "services.ollama"; }; openwebui = { name = "Open WebUI"; - icon = "${self}/files/topology-images/openwebui.png"; + icon = "services.open-webui"; }; comfyui = { name = "Comfy UI";