newedge/infra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix fmt

Browse Source
This commit is contained in:
kurogeek
2025-12-10 11:08:12 +07:00
parent 3b2b4ff2a4
commit b3d61ef94e
5 changed files with 91 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inventories/default.nix
View File

@@ -190,7 +190,7 @@
binds = [ "wlp1s0" ];
disks.m3 = {
uuid = "105D-319E";
mountOptions = ["utf8"];
mountOptions = [ "utf8" ];
};
};
};

26
machines/neptune/configuration.nix
View File

@@ -30,20 +30,24 @@
'';
};
networking.wireless = let
credentials = config.clan.core.vars.generators.wireless-credentials.files;
in {
enable = true;
secretsFile = credentials.psk.path;
networks.${credentials.essid.value}.pskRaw = "ext:psk";
};
networking.wireless =
let
credentials = config.clan.core.vars.generators.wireless-credentials.files;
in
{
enable = true;
secretsFile = credentials.psk.path;
networks.${credentials.essid.value}.pskRaw = "ext:psk";
};
networking.interfaces.wlp1s0 = {
useDHCP = false;
ipv4.addresses = [{
address = "10.0.0.9";
prefixLength = 24;
}];
ipv4.addresses = [
{
address = "10.0.0.9";
prefixLength = 24;
}
];
};
services.yggdrasil.settings.Peers = lib.mkForce [

117
modules/clan/jukebox/default.nix
View File

@@ -16,25 +16,32 @@
};
binds = lib.mkOption {
type = with lib.types; listOf str;
default = [];
default = [ ];
};
disks = lib.mkOption {
type = with lib.types; attrsOf (submodule ({name, ... }: {
options = {
name = lib.mkOption {
type = str;
default = name;
};
uuid = lib.mkOption {
type = str;
};
mountOptions = lib.mkOption {
type = listOf str;
default = [];
};
};
}));
default = {};
type =
with lib.types;
attrsOf (
submodule (
{ name, ... }:
{
options = {
name = lib.mkOption {
type = str;
default = name;
};
uuid = lib.mkOption {
type = str;
};
mountOptions = lib.mkOption {
type = listOf str;
default = [ ];
};
};
}
)
);
default = { };
description = "disks comprising library";
};
};
@@ -46,14 +53,19 @@
}:
{
nixosModule =
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
{
services.pulseaudio.enable = true;
# workaround cookie permissions
services.pulseaudio.tcp.enable = true;
services.pulseaudio.tcp.anonymousClients = {
allowedIpRanges = ["127.0.0.1"];
allowedIpRanges = [ "127.0.0.1" ];
allowAll = true;
};
@@ -61,33 +73,41 @@
"d ${settings.baseDir} 0755 root root"
];
fileSystems = let
disk2fs =
{ name, uuid, mountOptions, ... }:
lib.nameValuePair "${settings.baseDir}/${name}" {
device = "/dev/disk/by-uuid/${uuid}";
fsType = "auto";
options = ["noauto" "nofail"] ++ mountOptions;
};
in lib.listToAttrs
(lib.mapAttrsToList (_: disk2fs) settings.disks);
fileSystems =
let
disk2fs =
{
name,
uuid,
mountOptions,
...
}:
lib.nameValuePair "${settings.baseDir}/${name}" {
device = "/dev/disk/by-uuid/${uuid}";
fsType = "auto";
options = [
"noauto"
"nofail"
]
++ mountOptions;
};
in
lib.listToAttrs (lib.mapAttrsToList (_: disk2fs) settings.disks);
services.udev.extraRules = let
translate-prefix = path:
(lib.removePrefix "-"
(lib.replaceStrings ["/"] ["-"] path));
mount-name = name:
"${translate-prefix settings.baseDir}-${name}.mount";
disk2rule =
{ name, uuid, ... }:
lib.concatStringsSep ", " [
''ACTION=="add"''
''SUBSYSTEM=="block"''
''ENV{DEVLINKS}=="*/dev/disk/by-uuid/${uuid}*"''
''ENV{SYSTEMD_WANTS}="${mount-name name}"''
];
in lib.concatMapStringsSep "\n" disk2rule
(lib.attrValues settings.disks);
services.udev.extraRules =
let
translate-prefix = path: (lib.removePrefix "-" (lib.replaceStrings [ "/" ] [ "-" ] path));
mount-name = name: "${translate-prefix settings.baseDir}-${name}.mount";
disk2rule =
{ name, uuid, ... }:
lib.concatStringsSep ", " [
''ACTION=="add"''
''SUBSYSTEM=="block"''
''ENV{DEVLINKS}=="*/dev/disk/by-uuid/${uuid}*"''
''ENV{SYSTEMD_WANTS}="${mount-name name}"''
];
in
lib.concatMapStringsSep "\n" disk2rule (lib.attrValues settings.disks);
services.mpd = {
enable = true;
@@ -102,10 +122,11 @@
'';
};
networking.firewall.interfaces = lib.genAttrs settings.binds
(_: { allowedTCPPorts = [config.services.mpd.network.port]; });
networking.firewall.interfaces = lib.genAttrs settings.binds (_: {
allowedTCPPorts = [ config.services.mpd.network.port ];
});
environment.systemPackages = [pkgs.mpc];
environment.systemPackages = [ pkgs.mpc ];
};
};
};

5
modules/clan/phonebox/default.nix
View File

@@ -325,7 +325,10 @@
requires = [ "asterisk.service" ];
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ inotify-tools asterisk ];
path = with pkgs; [
inotify-tools
asterisk
];
script = ''
inotifywait -m -e move /etc/asterisk |
while read path action file; do

5
modules/clan/pulse-stream/default.nix
View File

@@ -12,7 +12,7 @@
options.client-ip-ranges = lib.mkOption {
type = lib.types.listOf lib.types.str;
description = "ip subnets permitted to stream to the server";
default = [];
default = [ ];
};
};
perInstance =
@@ -30,8 +30,7 @@
systemWide = true;
tcp = {
enable = true;
anonymousClients.allowedIpRanges =
settings.client-ip-ranges;
anonymousClients.allowedIpRanges = settings.client-ip-ranges;
anonymousClients.allowAll = true;
};
zeroconf.publish.enable = true;