max/config
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

modules/hyprspace: use upstream module

Browse source
This commit is contained in:
Max Headroom 2024-06-02 20:06:10 +02:00
parent 51d668820d
commit 1c30250536
5 changed files with 21 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosts/TITAN/extras/fbi-downloader.nix
View file

@ -39,5 +39,5 @@
networking.firewall.interfaces.tungsten.allowedTCPPorts = [ 9091 ]; networking.firewall.interfaces.tungsten.allowedTCPPorts = [ 9091 ];
services.hyprspace.services.fbi-download = "/tcp/${toString config.services.transmission.settings.rpc-port}"; services.hyprspace.settings.services.fbi-download = "/tcp/${toString config.services.transmission.settings.rpc-port}";
} }

2
hosts/TITAN/extras/invokeai.nix
View file

@ -13,5 +13,5 @@
}; };
}; };
services.hyprspace.services.invokeai = "/tcp/${toString config.services.invokeai.settings.port}"; services.hyprspace.settings.services.invokeai = "/tcp/${toString config.services.invokeai.settings.port}";
} }

2
modules/cockpit/default.nix
View file

@ -17,5 +17,5 @@ in
}; };
}; };
services.hyprspace.services.manage = "/tcp/${toString port}"; services.hyprspace.settings.services.manage = "/tcp/${toString port}";
} }

62
modules/hyprspace/default.nix
View file

@ -1,7 +1,6 @@
{ inputs, pkgs, lib, hosts, config, ... }: { inputs, pkgs, lib, hosts, config, ... }:
let let
inherit (config.networking) hostName; inherit (config.networking) hostName;
hyprspace = inputs.hyprspace.packages.${pkgs.system}.default;
hyprspaceCapableNodes = lib.filterAttrs (_: host: host ? hyprspace) hosts; hyprspaceCapableNodes = lib.filterAttrs (_: host: host ? hyprspace) hosts;
peersFormatted = builtins.mapAttrs (name: x: { peersFormatted = builtins.mapAttrs (name: x: {
inherit name; inherit name;
@ -12,63 +11,38 @@ let
peerList = builtins.attrValues peersFiltered; peerList = builtins.attrValues peersFiltered;
myNode = hosts.${hostName}; myNode = hosts.${hostName};
listenPort = myNode.hyprspace.listenPort or 8001; listenPort = myNode.hyprspace.listenPort or 8001;
interfaceConfig = pkgs.writeText "hyprspace.json" (builtins.toJSON {
listenAddresses = let
port = toString listenPort;
in [
"/ip4/0.0.0.0/tcp/${port}"
"/ip4/0.0.0.0/udp/${port}/quic-v1"
"/ip6/::/tcp/${port}"
"/ip6/::/udp/${port}/quic-v1"
];
privateKey = "@HYPRSPACEPRIVATEKEY@";
peers = peerList;
inherit (config.services.hyprspace) services;
});
privateKeyFile = config.age.secrets.hyprspace-key.path; privateKeyFile = config.age.secrets.hyprspace-key.path;
runConfig = "/run/hyprspace.json";
in { in {
imports = [ imports = [
./options.nix inputs.hyprspace.nixosModules.default
]; ];
age.secrets.hyprspace-key = { age.secrets.hyprspace-key = {
file = ../../secrets/hyprspace-key- + "${hostName}.age"; file = ../../secrets/hyprspace-key- + "${hostName}.age";
mode = "0400"; mode = "0400";
}; };
environment.systemPackages = [
hyprspace
];
systemd.services.hyprspace = { systemd.services.hyprspace = {
enable = true;
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
preStart = ''
test -e ${runConfig} && rm ${runConfig}
cp ${interfaceConfig} ${runConfig}
chmod 0600 ${runConfig}
${pkgs.replace-secret}/bin/replace-secret '@HYPRSPACEPRIVATEKEY@' "${privateKeyFile}" ${runConfig}
chmod 0400 ${runConfig}
'';
environment = lib.optionalAttrs config.services.kubo.enable { environment = lib.optionalAttrs config.services.kubo.enable {
HYPRSPACE_IPFS_API = config.services.kubo.settings.Addresses.API; HYPRSPACE_IPFS_API = config.services.kubo.settings.Addresses.API;
}; };
serviceConfig = { };
Group = "wheel";
Restart = "on-failure"; services.hyprspace = {
RestartSec = "5s"; enable = true;
ExecStart = "${hyprspace}/bin/hyprspace up -c ${runConfig}"; inherit privateKeyFile;
ExecStopPost = "${pkgs.coreutils}/bin/rm -f /run/hyprspace-rpc.hyprspace.sock"; settings = {
ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; listenAddresses = let
port = toString listenPort;
in [
"/ip4/0.0.0.0/tcp/${port}"
"/ip4/0.0.0.0/udp/${port}/quic-v1"
"/ip6/::/tcp/${port}"
"/ip6/::/udp/${port}/quic-v1"
];
peers = peerList;
}; };
}; };
networking.firewall = {
allowedTCPPorts = [ listenPort ];
allowedUDPPorts = [ listenPort ];
trustedInterfaces = [ "hyprspace" ];
};
networking.networkmanager.dispatcherScripts = [{ networking.networkmanager.dispatcherScripts = [{
source = pkgs.writeShellScript "hyprspace-reconnect.sh" '' source = pkgs.writeShellScript "hyprspace-reconnect.sh" ''
[[ "$2" != "up" ]] && exit 0 [[ "$2" != "up" ]] && exit 0

10
modules/hyprspace/options.nix
View file

@ -1,10 +0,0 @@
{ lib, ... }:
{
options.services.hyprspace = {
services = lib.mkOption {
type = lib.types.attrsOf lib.types.path;
default = {};
};
};
}