diff --git a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix index 0053eb5..5ab6ace 100755 --- a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix +++ b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix @@ -1,12 +1,7 @@ { flake, ... }: let - inherit (flake.config.machines.devices) - ceres - mars - ; - inherit (flake.config.services) - instances - ; + inherit (flake.config.machines.devices) mars; + inherit (flake.config.services) instances; makeBookmarks = { @@ -21,23 +16,24 @@ let keyword = instances.${name}.short; }) (builtins.map (service: instances.${service}.name) services); + instanceList = [ + instances.forgejo.name + instances.jellyfin.name + instances.mastodon.name + instances.vaultwarden.name + instances.firefly-iii.name + ]; bookmarkConfigs = [ { suffix = "(Remote)"; urlTemplate = name: "https://${instances.${name}.domains.url0}"; - services = [ - instances.audiobookshelf.name - instances.forgejo.name - instances.glance.name - instances.jellyfin.name - instances.mastodon.name - instances.ollama.name - instances.opencloud.name - instances.searx.name - instances.vaultwarden.name - instances.prompter.name - instances.firefly-iii.name - ]; + services = instanceList; + } + { + suffix = "(Server)"; + urlTemplate = + name: "http://${instances.${name}.interface.ip}:${builtins.toString instances.${name}.ports.port0}"; + services = instanceList; } { suffix = "(Desktop)"; @@ -47,15 +43,6 @@ let instances.syncthing.name ]; } - { - suffix = "(Server)"; - urlTemplate = - name: "http://${ceres.ip.address0}:${builtins.toString instances.${name}.ports.port0}"; - services = [ - instances.jellyfin.name - instances.firefly-iii.name - ]; - } ]; generatedBookmarks = builtins.concatLists (builtins.map makeBookmarks bookmarkConfigs);