privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

modules/hyprspace: use new config format

Browse source
This commit is contained in:
Max Headroom 2023-10-24 23:37:36 +02:00
parent e0790998d3
commit b11d28ebad
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/hyprspace/default.nix
View file

@ -3,9 +3,10 @@ let
inherit (config.networking) hostName; inherit (config.networking) hostName;
inherit (depot.packages) hyprspace; inherit (depot.packages) hyprspace;
hyprspaceCapableNodes = lib.filterAttrs (_: host: host.hyprspace.enable) depot.hours; hyprspaceCapableNodes = lib.filterAttrs (_: host: host.hyprspace.enable) depot.hours;
peersFormatted = builtins.mapAttrs (_: x: { peersFormatted = builtins.mapAttrs (name: x: {
inherit name;
inherit (x.hyprspace) id; inherit (x.hyprspace) id;
routes = map (net: { inherit net; }) ((x.hyprspace.routes or []) ++ [ "${x.hyprspace.addr}/32" ]); routes = map (net: { inherit net; }) x.hyprspace.routes;
}) hyprspaceCapableNodes; }) hyprspaceCapableNodes;
peersFiltered = lib.filterAttrs (name: _: name != hostName) peersFormatted; peersFiltered = lib.filterAttrs (name: _: name != hostName) peersFormatted;
peerList = builtins.attrValues peersFiltered; peerList = builtins.attrValues peersFiltered;
@ -17,7 +18,6 @@ let
name = "hyprspace"; name = "hyprspace";
listen_port = listenPort; listen_port = listenPort;
inherit (myNode.hyprspace) id; inherit (myNode.hyprspace) id;
address = "${myNode.hyprspace.addr}/24";
private_key = "@HYPRSPACEPRIVATEKEY@"; private_key = "@HYPRSPACEPRIVATEKEY@";
}; };
peers = peerList; peers = peerList;
@ -29,7 +29,6 @@ let
in { in {
links.hyprspaceMetrics.protocol = "http"; links.hyprspaceMetrics.protocol = "http";
networking.hosts = lib.mapAttrs' (k: v: lib.nameValuePair v.hyprspace.addr [k "${k}.hypr"]) hyprspaceCapableNodes;
age.secrets.hyprspace-key = { age.secrets.hyprspace-key = {
file = ../../secrets/hyprspace-key- + "${hostName}.age"; file = ../../secrets/hyprspace-key- + "${hostName}.age";
mode = "0400"; mode = "0400";