mirror of
https://github.com/gensokyo-zone/infrastructure.git
synced 2026-02-09 04:19:19 -08:00
chore: nf-fmt-nix
This commit is contained in:
parent
e4bbddb004
commit
32ff0a8e0c
7 changed files with 152 additions and 138 deletions
11
lib.nix
11
lib.nix
|
|
@ -19,16 +19,21 @@
|
||||||
nibble0 = Str.index part 0;
|
nibble0 = Str.index part 0;
|
||||||
in
|
in
|
||||||
nibble0 + UInt.toHexLower nibble1;
|
nibble0 + UInt.toHexLower nibble1;
|
||||||
in trimAddress6 "${part0 (part 0)}${part 1}:${part 2}ff:fe${part 3}:${part 4}${part 5}";
|
in
|
||||||
|
trimAddress6 "${part0 (part 0)}${part 1}:${part 2}ff:fe${part 3}:${part 4}${part 5}";
|
||||||
|
|
||||||
trimAddress6 = let
|
trimAddress6 = let
|
||||||
matcher = match ''(^|.*:)(0+)([0-9a-fA-F].*)'';
|
matcher = match ''(^|.*:)(0+)([0-9a-fA-F].*)'';
|
||||||
in addr: let
|
in
|
||||||
|
addr: let
|
||||||
matched = matcher addr;
|
matched = matcher addr;
|
||||||
prefix = elemAt matched 0;
|
prefix = elemAt matched 0;
|
||||||
postfix = elemAt matched 2;
|
postfix = elemAt matched 2;
|
||||||
addrReplaced = prefix + postfix;
|
addrReplaced = prefix + postfix;
|
||||||
in if matched == null then addr else trimAddress6 addrReplaced;
|
in
|
||||||
|
if matched == null
|
||||||
|
then addr
|
||||||
|
else trimAddress6 addrReplaced;
|
||||||
|
|
||||||
parseUrl = url: let
|
parseUrl = url: let
|
||||||
parts' = Regex.match ''^([^:]+)://(\[[0-9a-fA-F:]+]|[^/:\[]+)(|:[0-9]+)(|/.*)$'' url;
|
parts' = Regex.match ''^([^:]+)://(\[[0-9a-fA-F:]+]|[^/:\[]+)(|:[0-9]+)(|/.*)$'' url;
|
||||||
|
|
|
||||||
2
modules/extern/nixos/monitoring.nix
vendored
2
modules/extern/nixos/monitoring.nix
vendored
|
|
@ -62,7 +62,7 @@ let
|
||||||
in {
|
in {
|
||||||
enable = mkDefault true;
|
enable = mkDefault true;
|
||||||
port = mkDefault 9091;
|
port = mkDefault 9091;
|
||||||
extraFlags = [ "--collector.disable-defaults" ];
|
extraFlags = ["--collector.disable-defaults"];
|
||||||
enabledCollectors = mkIf cfg.defaultCollectors (mkMerge [
|
enabledCollectors = mkIf cfg.defaultCollectors (mkMerge [
|
||||||
[
|
[
|
||||||
"systemd"
|
"systemd"
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,15 @@
|
||||||
let
|
let
|
||||||
deviceModule = {config, lib, ...}: let
|
deviceModule = {
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
inherit (lib.options) mkOption mkEnableOption;
|
inherit (lib.options) mkOption mkEnableOption;
|
||||||
in {
|
in {
|
||||||
options = with lib.types; {
|
options = with lib.types; {
|
||||||
enable = mkEnableOption "adb device" // {
|
enable =
|
||||||
|
mkEnableOption "adb device"
|
||||||
|
// {
|
||||||
default = true;
|
default = true;
|
||||||
};
|
};
|
||||||
uphold = mkOption {
|
uphold = mkOption {
|
||||||
|
|
@ -15,14 +21,15 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
config,
|
config,
|
||||||
gensokyo-zone,
|
gensokyo-zone,
|
||||||
utils,
|
utils,
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (lib.options) mkOption mkPackageOption mkEnableOption;
|
inherit (lib.options) mkOption mkPackageOption mkEnableOption;
|
||||||
inherit (lib.modules) mkIf mkMerge mkDefault mkOptionDefault;
|
inherit (lib.modules) mkIf mkMerge mkDefault mkOptionDefault;
|
||||||
inherit (lib.attrsets) filterAttrs mapAttrsToList;
|
inherit (lib.attrsets) filterAttrs mapAttrsToList;
|
||||||
|
|
@ -31,7 +38,7 @@ in {
|
||||||
inherit (gensokyo-zone.lib) mapOptionDefaults;
|
inherit (gensokyo-zone.lib) mapOptionDefaults;
|
||||||
cfg = config.services.adb;
|
cfg = config.services.adb;
|
||||||
enabledDevices = filterAttrs (_: device: device.enable) cfg.devices;
|
enabledDevices = filterAttrs (_: device: device.enable) cfg.devices;
|
||||||
in {
|
in {
|
||||||
options.services.adb = with lib.types; {
|
options.services.adb = with lib.types; {
|
||||||
enable = mkEnableOption "adb server";
|
enable = mkEnableOption "adb server";
|
||||||
package = mkPackageOption pkgs "android-tools" {};
|
package = mkPackageOption pkgs "android-tools" {};
|
||||||
|
|
@ -49,7 +56,7 @@ in {
|
||||||
default = [];
|
default = [];
|
||||||
};
|
};
|
||||||
settings = mkOption {
|
settings = mkOption {
|
||||||
type = attrsOf (oneOf [ str int (nullOr bool) ]);
|
type = attrsOf (oneOf [str int (nullOr bool)]);
|
||||||
};
|
};
|
||||||
devices = mkOption {
|
devices = mkOption {
|
||||||
type = attrsOf (submoduleWith {
|
type = attrsOf (submoduleWith {
|
||||||
|
|
@ -69,19 +76,20 @@ in {
|
||||||
P = cfg.port;
|
P = cfg.port;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
conf.services.udev.packages = [ cfg.rulesPackage ];
|
conf.services.udev.packages = [cfg.rulesPackage];
|
||||||
conf.environment.systemPackages = [ cfg.package ];
|
conf.environment.systemPackages = [cfg.package];
|
||||||
conf.users.groups.adbusers = {};
|
conf.users.groups.adbusers = {};
|
||||||
conf.systemd.services.adb = {
|
conf.systemd.services.adb = {
|
||||||
upholds = let
|
upholds = let
|
||||||
upheldDevices = filterAttrs (_: device: device.uphold) enabledDevices;
|
upheldDevices = filterAttrs (_: device: device.uphold) enabledDevices;
|
||||||
in mapAttrsToList (_: device: "adb-device@${escapeSystemdPath device.serial}.service") upheldDevices;
|
in
|
||||||
|
mapAttrsToList (_: device: "adb-device@${escapeSystemdPath device.serial}.service") upheldDevices;
|
||||||
after = ["network.target"];
|
after = ["network.target"];
|
||||||
wantedBy = ["multi-user.target"];
|
wantedBy = ["multi-user.target"];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = mkOptionDefault "forking";
|
Type = mkOptionDefault "forking";
|
||||||
ExecStart = let
|
ExecStart = let
|
||||||
args = toGNUCommandLine { } cfg.settings ++ cfg.extraArguments;
|
args = toGNUCommandLine {} cfg.settings ++ cfg.extraArguments;
|
||||||
in [
|
in [
|
||||||
"${cfg.package}/bin/adb start-server ${escapeSystemdExecArgs args}"
|
"${cfg.package}/bin/adb start-server ${escapeSystemdExecArgs args}"
|
||||||
];
|
];
|
||||||
|
|
@ -95,7 +103,7 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
conf.systemd.services."adb-device@" = rec {
|
conf.systemd.services."adb-device@" = rec {
|
||||||
requisite = [ "adb.service" ];
|
requisite = ["adb.service"];
|
||||||
partOf = requisite;
|
partOf = requisite;
|
||||||
after = requisite;
|
after = requisite;
|
||||||
environment = mapOptionDefaults {
|
environment = mapOptionDefaults {
|
||||||
|
|
@ -134,4 +142,4 @@ in {
|
||||||
confService
|
confService
|
||||||
(mkIf cfg.enable conf)
|
(mkIf cfg.enable conf)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ in {
|
||||||
services.prometheus.exporters = {
|
services.prometheus.exporters = {
|
||||||
node = {
|
node = {
|
||||||
port = 9091;
|
port = 9091;
|
||||||
extraFlags = [ "--collector.disable-defaults" ];
|
extraFlags = ["--collector.disable-defaults"];
|
||||||
enabledCollectors = mkMerge [
|
enabledCollectors = mkMerge [
|
||||||
(mkIf config.boot.supportedFilesystems.xfs or false [
|
(mkIf config.boot.supportedFilesystems.xfs or false [
|
||||||
"xfs"
|
"xfs"
|
||||||
|
|
|
||||||
|
|
@ -295,14 +295,12 @@ in {
|
||||||
hasService = system: system.exports.services.${service}.enable;
|
hasService = system: system.exports.services.${service}.enable;
|
||||||
notFound = throw "no system found serving ${service}";
|
notFound = throw "no system found serving ${service}";
|
||||||
multiple = throw "multiple systems found serving ${service}";
|
multiple = throw "multiple systems found serving ${service}";
|
||||||
in
|
in (findSingle hasService notFound multiple (attrValues systems));
|
||||||
(findSingle hasService notFound multiple (attrValues systems));
|
|
||||||
systemForServiceId = serviceId: let
|
systemForServiceId = serviceId: let
|
||||||
hasService = system: findSingle (service: service.id == serviceId && service.enable) null multiple (attrValues system.exports.services) != null;
|
hasService = system: findSingle (service: service.id == serviceId && service.enable) null multiple (attrValues system.exports.services) != null;
|
||||||
notFound = throw "no system found serving ${serviceId}";
|
notFound = throw "no system found serving ${serviceId}";
|
||||||
multiple = throw "multiple systems found serving ${serviceId}";
|
multiple = throw "multiple systems found serving ${serviceId}";
|
||||||
in
|
in (findSingle hasService notFound multiple (attrValues systems));
|
||||||
(findSingle hasService notFound multiple (attrValues systems));
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,10 +18,12 @@ in {
|
||||||
settings.fail_timeout = mkDefault timeout;
|
settings.fail_timeout = mkDefault timeout;
|
||||||
addr = mkDefault "10.1.1.67";
|
addr = mkDefault "10.1.1.67";
|
||||||
port = mkDefault nfandroidtv.ports.default.port;
|
port = mkDefault nfandroidtv.ports.default.port;
|
||||||
/*accessService = {
|
/*
|
||||||
|
accessService = {
|
||||||
system = "bedroomtv";
|
system = "bedroomtv";
|
||||||
name = "nfandroidtv";
|
name = "nfandroidtv";
|
||||||
};*/
|
};
|
||||||
|
*/
|
||||||
};
|
};
|
||||||
fallback = let
|
fallback = let
|
||||||
virtualHost = nginx.virtualHosts.nfandroidtv'fallback;
|
virtualHost = nginx.virtualHosts.nfandroidtv'fallback;
|
||||||
|
|
@ -70,7 +72,8 @@ in {
|
||||||
config.networking.firewall.interfaces.lan = let
|
config.networking.firewall.interfaces.lan = let
|
||||||
virtualHost = nginx.virtualHosts.nfandroidtv'local;
|
virtualHost = nginx.virtualHosts.nfandroidtv'local;
|
||||||
listen = virtualHost.listen'.nfandroidtv;
|
listen = virtualHost.listen'.nfandroidtv;
|
||||||
in mkIf (virtualHost.enable && listen.enable) {
|
in
|
||||||
allowedTCPPorts = [ listen.port ];
|
mkIf (virtualHost.enable && listen.enable) {
|
||||||
|
allowedTCPPorts = [listen.port];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,10 @@ in {
|
||||||
};
|
};
|
||||||
systemd.services = mkIf cfg.enable {
|
systemd.services = mkIf cfg.enable {
|
||||||
adb = {
|
adb = {
|
||||||
environment.ADB_TRACE = mkDefault (toString [ "adb" ]);
|
environment.ADB_TRACE = mkDefault (toString ["adb"]);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
networking.firewall.interfaces.lan = mkIf (cfg.enable && cfg.settings.a or false == true) {
|
networking.firewall.interfaces.lan = mkIf (cfg.enable && cfg.settings.a or false == true) {
|
||||||
allowedTCPPorts = [ cfg.port ];
|
allowedTCPPorts = [cfg.port];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue