diff --git a/.github/README.md b/.github/README.md index 35d79ca..f269ced 100644 --- a/.github/README.md +++ b/.github/README.md @@ -109,8 +109,7 @@
Click here for a summary of my infrastructure -topology - +topology ### Programs diff --git a/SwarselSystems.org b/SwarselSystems.org index 26fcf60..2b42a45 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -2662,7 +2662,8 @@ Another note concerning [[https://flake.parts/][flake-parts]]: ender3 = mkDevice "Ender 3" { info = "SKR V1.3, TMC2209 (Dual), TFT35"; - image = "${self}/files/topology-images/ender3.png"; + deviceIcon = "${self}/files/topology-images/ender3.png"; + icon = "${self}/files/topology-images/raspi.png"; interfaces.eth1 = { }; services = { octoprint = { @@ -6207,7 +6208,7 @@ This machine mainly acts as my proxy server to stand before my local machines. }; restic.targets = { SwarselMoonside = { - repository = config.repo.secrets.local.resticRepoState; + repository = config.repo.secrets.local.resticRepo; paths = [ "/persist/opt/minecraft" ]; @@ -12727,11 +12728,7 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin sops.secrets.kavita-token = { inherit sopsFile; owner = serviceUser; }; # networking.firewall.allowedTCPPorts = [ servicePort ]; - topology.self.services.${serviceName} = { - name = "Kavita"; - info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; + topology.self.services.${serviceName}.info = "https://${serviceDomain}"; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { directories = [{ directory = "/var/lib/${serviceName}"; user = serviceUser; group = serviceGroup; }]; @@ -13148,11 +13145,7 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin mpv ]; - topology.self.services.${serviceName} = { - name = lib.toUpper serviceName; - info = "http://localhost:${builtins.toString servicePort}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; + topology.self.services.${serviceName}.info = "http://localhost:${builtins.toString servicePort}"; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { directories = [{ directory = "/var/lib/${serviceName}"; user = "mpd"; group = "mpd"; }]; @@ -13234,13 +13227,6 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin options.swarselmodules.server.${serviceName} = lib.mkEnableOption "enable ${serviceName} on server"; config = lib.mkIf config.swarselmodules.server.${serviceName} { - topology.self.services = { - ${serviceName} = { - name = lib.swarselsystems.toCapitalized serviceName; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; - }; - services = { ${serviceName} = { enable = true; @@ -13388,19 +13374,13 @@ This is the configuration to make [[#h:58c7563e-6954-42e6-a622-9d06523e8e24][Hin # networking.firewall.allowedTCPPorts = [ servicePort federationPort ]; - topology.self.services = { - ${serviceName} = { - name = lib.swarselsystems.toCapitalized serviceName; - info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; - } // (lib.listToAttrs (map + topology.self.services = lib.listToAttrs (map (service: lib.nameValuePair "mautrix-${service}" { name = "mautrix-${service}"; icon = "${self}/files/topology-images/mautrix.png"; }) - [ "whatsapp" "signal" "telegram" ])); + [ "whatsapp" "signal" "telegram" ]); systemd = { timers."restart-bridges" = { @@ -37573,8 +37553,7 @@ 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/ender3.png b/files/topology-images/ender3.png index cff711a..16db113 100644 Binary files a/files/topology-images/ender3.png and b/files/topology-images/ender3.png differ diff --git a/files/topology-images/ender3_.png b/files/topology-images/ender3_.png deleted file mode 100644 index cff711a..0000000 Binary files a/files/topology-images/ender3_.png and /dev/null differ diff --git a/files/topology-images/raspi.png b/files/topology-images/raspi.png new file mode 100644 index 0000000..884f8bb Binary files /dev/null and b/files/topology-images/raspi.png differ diff --git a/files/topology/topology.png b/files/topology/topology.png index d95587f..6960555 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 e96fc81..d1663db 100644 Binary files a/files/topology/topology_small.png and b/files/topology/topology_small.png differ diff --git a/flake.lock b/flake.lock index b264af1..477b76d 100644 --- a/flake.lock +++ b/flake.lock @@ -1616,11 +1616,11 @@ }, "nixpkgs-dev": { "locked": { - "lastModified": 1767131767, - "narHash": "sha256-APHjXWyLmNKFNXoVU7Z82L8zUeSpR1/owKFryitWSsg=", + "lastModified": 1768915681, + "narHash": "sha256-/eIZP//Ey3HLNlZj8ucVXnzv+qO8RkGvUHWmFL58PzY=", "owner": "Swarsel", "repo": "nixpkgs", - "rev": "449fa265ea9c67c1ea9b1c3d8121959e2ce348d3", + "rev": "5f51dc7790416d9122723da3b4843ba8b49955d4", "type": "github" }, "original": { diff --git a/hosts/nixos/aarch64-linux/moonside/default.nix b/hosts/nixos/aarch64-linux/moonside/default.nix index 09d244b..2a7c61b 100644 --- a/hosts/nixos/aarch64-linux/moonside/default.nix +++ b/hosts/nixos/aarch64-linux/moonside/default.nix @@ -84,7 +84,7 @@ in }; restic.targets = { SwarselMoonside = { - repository = config.repo.secrets.local.resticRepoState; + repository = config.repo.secrets.local.resticRepo; paths = [ "/persist/opt/minecraft" ]; diff --git a/modules/nixos/server/kavita.nix b/modules/nixos/server/kavita.nix index 2e59d4f..b058077 100644 --- a/modules/nixos/server/kavita.nix +++ b/modules/nixos/server/kavita.nix @@ -23,11 +23,7 @@ in sops.secrets.kavita-token = { inherit sopsFile; owner = serviceUser; }; # networking.firewall.allowedTCPPorts = [ servicePort ]; - topology.self.services.${serviceName} = { - name = "Kavita"; - info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; + topology.self.services.${serviceName}.info = "https://${serviceDomain}"; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { directories = [{ directory = "/var/lib/${serviceName}"; user = serviceUser; group = serviceGroup; }]; diff --git a/modules/nixos/server/matrix.nix b/modules/nixos/server/matrix.nix index 9835376..908cd8e 100644 --- a/modules/nixos/server/matrix.nix +++ b/modules/nixos/server/matrix.nix @@ -63,19 +63,13 @@ in # networking.firewall.allowedTCPPorts = [ servicePort federationPort ]; - topology.self.services = { - ${serviceName} = { - name = lib.swarselsystems.toCapitalized serviceName; - info = "https://${serviceDomain}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; - } // (lib.listToAttrs (map + topology.self.services = lib.listToAttrs (map (service: lib.nameValuePair "mautrix-${service}" { name = "mautrix-${service}"; icon = "${self}/files/topology-images/mautrix.png"; }) - [ "whatsapp" "signal" "telegram" ])); + [ "whatsapp" "signal" "telegram" ]); systemd = { timers."restart-bridges" = { diff --git a/modules/nixos/server/mpd.nix b/modules/nixos/server/mpd.nix index 807135d..87f4a54 100644 --- a/modules/nixos/server/mpd.nix +++ b/modules/nixos/server/mpd.nix @@ -30,11 +30,7 @@ in mpv ]; - topology.self.services.${serviceName} = { - name = lib.toUpper serviceName; - info = "http://localhost:${builtins.toString servicePort}"; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; + topology.self.services.${serviceName}.info = "http://localhost:${builtins.toString servicePort}"; environment.persistence."/state" = lib.mkIf config.swarselsystems.isMicroVM { directories = [{ directory = "/var/lib/${serviceName}"; user = "mpd"; group = "mpd"; }]; diff --git a/modules/nixos/server/postgresql.nix b/modules/nixos/server/postgresql.nix index 4cf3554..0a4f9f9 100644 --- a/modules/nixos/server/postgresql.nix +++ b/modules/nixos/server/postgresql.nix @@ -8,13 +8,6 @@ in options.swarselmodules.server.${serviceName} = lib.mkEnableOption "enable ${serviceName} on server"; config = lib.mkIf config.swarselmodules.server.${serviceName} { - topology.self.services = { - ${serviceName} = { - name = lib.swarselsystems.toCapitalized serviceName; - icon = "${self}/files/topology-images/${serviceName}.png"; - }; - }; - services = { ${serviceName} = { enable = true; diff --git a/nix/topology.nix b/nix/topology.nix index 0196de2..909fd31 100644 --- a/nix/topology.nix +++ b/nix/topology.nix @@ -192,7 +192,8 @@ ender3 = mkDevice "Ender 3" { info = "SKR V1.3, TMC2209 (Dual), TFT35"; - image = "${self}/files/topology-images/ender3.png"; + deviceIcon = "${self}/files/topology-images/ender3.png"; + icon = "${self}/files/topology-images/raspi.png"; interfaces.eth1 = { }; services = { octoprint = {