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 file format

Browse source
This commit is contained in:
Max Headroom 2023-01-23 00:48:51 +01:00
parent 2809d3d1e1
commit c860fab44d
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/hyprspace/default.nix
View file

@ -3,15 +3,15 @@ let
inherit (config.networking) hostName; inherit (config.networking) hostName;
inherit (inputs.self.packages.${pkgs.system}) hyprspace; inherit (inputs.self.packages.${pkgs.system}) hyprspace;
hyprspaceCapableNodes = lib.filterAttrs (_: host: host ? hypr) hosts; hyprspaceCapableNodes = lib.filterAttrs (_: host: host ? hypr) hosts;
peersFormatted = builtins.mapAttrs (_: x: { "${x.hypr.addr}".id = x.hypr.id; }) hyprspaceCapableNodes; peersFormatted = builtins.mapAttrs (_: x: {
inherit (x.hypr) id;
routes = map (net: { inherit net; }) ((x.hypr.routes or []) ++ [ "${x.hypr.addr}/32" ]);
}) hyprspaceCapableNodes;
peersFiltered = lib.filterAttrs (name: _: name != hostName) peersFormatted; peersFiltered = lib.filterAttrs (name: _: name != hostName) peersFormatted;
peerList = lib.foldAttrs (n: _: n) null (builtins.attrValues peersFiltered); peerList = builtins.attrValues peersFiltered;
myNode = hosts.${hostName}; myNode = hosts.${hostName};
listenPort = myNode.hypr.listenPort or 8001; listenPort = myNode.hypr.listenPort or 8001;
routes' = map (x: lib.genAttrs (x.hypr.routes or []) (_: { ip = x.hypr.addr; })) (builtins.attrValues hyprspaceCapableNodes);
routes = builtins.foldl' (x: y: x // y) {} (lib.flatten routes');
interfaceConfig = pkgs.writeText "hyprspace.yml" (builtins.toJSON { interfaceConfig = pkgs.writeText "hyprspace.yml" (builtins.toJSON {
interface = { interface = {
name = "hyprspace"; name = "hyprspace";
@ -21,7 +21,6 @@ let
private_key = "@HYPRSPACEPRIVATEKEY@"; private_key = "@HYPRSPACEPRIVATEKEY@";
}; };
peers = peerList; peers = peerList;
inherit routes;
}); });
privateKeyFile = config.age.secrets.hyprspace-key.path; privateKeyFile = config.age.secrets.hyprspace-key.path;