sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

run nixpkgs-fmt

Browse source
This commit is contained in:
Jörg Thalheim 2022-08-14 16:49:30 +02:00
parent 75415763e1
commit 3c90c4e16b
22 changed files with 137 additions and 109 deletions

40
build02/packages-with-update-script.nix
View file

@ -1,22 +1,22 @@
let
pkgs = import /var/cache/nixpkgs-update/updatescript/nixpkgs {};
pkgs = import /var/cache/nixpkgs-update/updatescript/nixpkgs { };
in
# code in the following let block was copied from nixos/nixpkgs under
# the MIT License
# the MIT License
let
inherit (pkgs) lib;
/* Remove duplicate elements from the list based on some extracted value. O(n^2) complexity.
*/
nubOn = f: list:
if list == [] then
[]
if list == [ ] then
[ ]
else
let
x = lib.head list;
xs = lib.filter (p: f x != f p) (lib.drop 1 list);
in
[x] ++ nubOn f xs;
[ x ] ++ nubOn f xs;
/* Recursively find all packages (derivations) in `pkgs` matching `cond` predicate.
@ -35,25 +35,25 @@ let
dedupResults = lst: nubOn ({ package, attrPath }: package.updateScript) (lib.concatLists lst);
in
if result.success then
let
evaluatedPathContent = result.value;
in
if lib.isDerivation evaluatedPathContent then
lib.optional (cond path evaluatedPathContent) { attrPath = lib.concatStringsSep "." path; package = evaluatedPathContent; }
else if lib.isAttrs evaluatedPathContent then
# If user explicitly points to an attrSet or it is marked for recursion, we recur.
if path == rootPath || evaluatedPathContent.recurseForDerivations or false || evaluatedPathContent.recurseForRelease or false then
dedupResults (lib.mapAttrsToList (name: elem: packagesWithPathInner (path ++ [name]) elem) evaluatedPathContent)
else []
else []
else [];
if result.success then
let
evaluatedPathContent = result.value;
in
if lib.isDerivation evaluatedPathContent then
lib.optional (cond path evaluatedPathContent) { attrPath = lib.concatStringsSep "." path; package = evaluatedPathContent; }
else if lib.isAttrs evaluatedPathContent then
# If user explicitly points to an attrSet or it is marked for recursion, we recur.
if path == rootPath || evaluatedPathContent.recurseForDerivations or false || evaluatedPathContent.recurseForRelease or false then
dedupResults (lib.mapAttrsToList (name: elem: packagesWithPathInner (path ++ [ name ]) elem) evaluatedPathContent)
else [ ]
else [ ]
else [ ];
in
packagesWithPathInner rootPath pkgs;
packagesWithPathInner rootPath pkgs;
/* Recursively find all packages (derivations) in `pkgs` matching `cond` predicate.
*/
packagesWith = packagesWithPath [];
packagesWith = packagesWithPath [ ];
/* Recursively find all packages in `pkgs` with updateScript matching given predicate.
*/

1
build03/configuration.nix
View file

@ -17,6 +17,7 @@
../roles/hetzner-network.nix
../roles/nginx.nix
../roles/raid.nix
../roles/aarch64-builder.nix
../services/hound
../services/matterbridge.nix

20
build04/configuration.nix
View file

@ -34,14 +34,14 @@
# after loading kexec, be patient. The kexec image can take up to 5 minutes to boot
# partition guide
/*
sgdisk -n 1:0:+800M -N 2 -t 1:ef00 -t 2:8304 /dev/sda
mkfs.vfat -b32 /dev/sda1
zpool create zroot -O acltype=posixacl -O xattr=sa -O compression=lz4 /dev/sda2
zfs create -o mountpoint=none zroot/root
zfs create -o mountpoint=legacy zroot/root/nixos
zfs create -o mountpoint=legacy zroot/root/home
mount -t zfs zroot/root/nixos /mnt
mkdir /mnt/{home,boot}
mount -t zfs zroot/root/home /mnt/home
mount /dev/sda1 /mnt/boot
sgdisk -n 1:0:+800M -N 2 -t 1:ef00 -t 2:8304 /dev/sda
mkfs.vfat -b32 /dev/sda1
zpool create zroot -O acltype=posixacl -O xattr=sa -O compression=lz4 /dev/sda2
zfs create -o mountpoint=none zroot/root
zfs create -o mountpoint=legacy zroot/root/nixos
zfs create -o mountpoint=legacy zroot/root/home
mount -t zfs zroot/root/nixos /mnt
mkdir /mnt/{home,boot}
mount -t zfs zroot/root/home /mnt/home
mount /dev/sda1 /mnt/boot
*/

12
build04/hardware-configuration.nix
View file

@ -5,7 +5,8 @@
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
[
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" ];
@ -14,17 +15,20 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "zroot/root/nixos";
{
device = "zroot/root/nixos";
fsType = "zfs";
};
fileSystems."/home" =
{ device = "zroot/root/home";
{
device = "zroot/root/home";
fsType = "zfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/E6D6-572B";
{
device = "/dev/disk/by-uuid/E6D6-572B";
fsType = "vfat";
};

6
roles/aarch64-builder.nix
View file

@ -3,10 +3,10 @@
nix.distributedBuilds = true;
nix.buildMachines = [
{
hostName = "aarch64.nixos.community";
hostName = "build04.nixos-community.org";
maxJobs = 4;
sshKey = config.sops.secrets.id_buildfarm.path;
sshUser = "ssh-ng://nix";
sshUser = "nix";
system = "aarch64-linux";
supportedFeatures = [
"big-parallel"
@ -15,5 +15,5 @@
];
}
];
sops.secrets.id_buildfarm = {};
sops.secrets.id_buildfarm = { };
}

4
roles/builder.nix
View file

@ -8,6 +8,6 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEmdo1x1QkRepZf7nSe+OdEWX+wOjkBLF70vX9F+xf68 builder"
];
};
users.groups.nix = {};
nix.settings.trusted-users = ["nix"];
users.groups.nix = { };
nix.settings.trusted-users = [ "nix" ];
}

11
roles/builder/users.nix
View file

@ -32,11 +32,11 @@ let
ifAttr = key: default: result: opts:
if (opts ? "${key}") && opts."${key}"
then result
else default;
then result
else default;
maybeTrusted = ifAttr "trusted" [] [ "trusted" ];
maybeWheel = ifAttr "sudo" [] [ "wheel" ];
maybeTrusted = ifAttr "trusted" [ ] [ "trusted" ];
maybeWheel = ifAttr "sudo" [ ] [ "wheel" ];
userGroups = opts:
(maybeTrusted opts) ++
@ -53,7 +53,8 @@ let
opts.keys
];
};
in {
in
{
users = {
mutableUsers = false;
users = lib.mapAttrs descToUser users;

4
roles/hardware/hetzner-amd.nix
View file

@ -18,8 +18,8 @@
];
fileSystems."/" = {
device = "zroot/root/nixos";
fsType = "zfs";
device = "zroot/root/nixos";
fsType = "zfs";
};
fileSystems."/home" = {

3
roles/hercules-ci/default.nix
View file

@ -5,7 +5,8 @@ let
sopsFile = ./secrets.yaml;
};
secrets = config.sops.secrets;
in {
in
{
sops.secrets."binary-caches.json" = herculesSecret;
sops.secrets."cluster-join-token.key" = herculesSecret;
sops.secrets."hercules-secrets" = herculesSecret;

3
roles/hetzner-network.nix
View file

@ -2,7 +2,8 @@
with lib;
let
cfg = config.networking.nix-community;
in {
in
{
options = {
networking.nix-community.ipv6.address = mkOption {
type = types.str;

2
roles/nix-daemon.nix
View file

@ -42,5 +42,5 @@ in
Restart = "on-failure";
};
users.groups.trusted = {};
users.groups.trusted = { };
}

2
roles/raid.nix
View file

@ -1,5 +1,5 @@
{
# for mdraid 1.1
boot.loader.grub.extraConfig = "insmod mdraid1x";
services.telegraf.extraConfig.inputs.mdstat = {};
services.telegraf.extraConfig.inputs.mdstat = { };
}

8
roles/security.nix
View file

@ -26,19 +26,19 @@
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
};
build01 = {
hostNames = ["build01.nix-community.org"];
hostNames = [ "build01.nix-community.org" ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIElIQ54qAy7Dh63rBudYKdbzJHrrbrrMXLYl7Pkmk88H";
};
build02 = {
hostNames = ["build02.nix-community.org"];
hostNames = [ "build02.nix-community.org" ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMm3/o1HguyRL1z/nZxLBY9j/YUNXeNuDoiBLZAyt88Z";
};
build03 = {
hostNames = ["build03.nix-community.org"];
hostNames = [ "build03.nix-community.org" ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFiozp1A1+SUfJQPa5DZUQcVc6CZK2ZxL6FJtNdh+2TP";
};
build04 = {
hostNames = ["build04.nix-community.org"];
hostNames = [ "build04.nix-community.org" ];
publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPU/gbREwVuI1p3ag1iG72jxl2/92yGl38c+TPOfFMH8";
};
};

69
roles/telegraf/default.nix
View file

@ -25,7 +25,7 @@ in
exec /run/wrappers/bin/sudo ${pkgs.smartmontools}/bin/smartctl "$@"
'';
};
mdstat = {};
mdstat = { };
system = { };
mem = { };
file = [{
@ -37,7 +37,7 @@ in
files = [ "/sys/fs/ext4/*/errors_count" ];
data_format = "value";
};
exec = [{
exec = [{
## Commands array
commands = (lib.optional (lib.any (fs: fs == "zfs") config.boot.supportedFilesystems)
(pkgs.writeScript "zpool-health" ''
@ -52,40 +52,47 @@ in
}
}
'')
) ++ (let
) ++ (
let
collectHosts = shares: fs:
if builtins.elem fs.fsType ["nfs" "nfs3" "nfs4"] then
shares // (let
# also match ipv6 addresses
group = builtins.match "\\[?([^\]]+)]?:([^:]+)$" fs.device;
host = builtins.head group;
path = builtins.elemAt group 1;
in {
${host} = (shares.${host} or []) ++ [ path ];
})
if builtins.elem fs.fsType [ "nfs" "nfs3" "nfs4" ] then
shares // (
let
# also match ipv6 addresses
group = builtins.match "\\[?([^\]]+)]?:([^:]+)$" fs.device;
host = builtins.head group;
path = builtins.elemAt group 1;
in
{
${host} = (shares.${host} or [ ]) ++ [ path ];
}
)
else
shares;
nfsHosts = lib.foldl collectHosts {} (builtins.attrValues config.fileSystems);
in lib.mapAttrsToList (host: args:
(pkgs.writeScript "zpool-health" ''
#!${pkgs.gawk}/bin/awk -f
BEGIN {
for (i = 2; i < ARGC; i++) {
mounts[ARGV[i]] = 1
}
while ("${pkgs.nfs-utils}/bin/showmount -e " ARGV[1] | getline) {
if (NR == 1) { continue }
if (mounts[$1] == 1) {
printf "nfs_export,host=%s,path=%s present=1\n", ARGV[1], $1
nfsHosts = lib.foldl collectHosts { } (builtins.attrValues config.fileSystems);
in
lib.mapAttrsToList
(host: args:
(pkgs.writeScript "zpool-health" ''
#!${pkgs.gawk}/bin/awk -f
BEGIN {
for (i = 2; i < ARGC; i++) {
mounts[ARGV[i]] = 1
}
while ("${pkgs.nfs-utils}/bin/showmount -e " ARGV[1] | getline) {
if (NR == 1) { continue }
if (mounts[$1] == 1) {
printf "nfs_export,host=%s,path=%s present=1\n", ARGV[1], $1
}
delete mounts[$1]
}
for (mount in mounts) {
printf "nfs_export,host=%s,path=%s present=0\n", ARGV[1], $1
}
delete mounts[$1]
}
for (mount in mounts) {
printf "nfs_export,host=%s,path=%s present=0\n", ARGV[1], $1
}
}
'') + " ${host} ${builtins.concatStringsSep " " args}"
) nfsHosts
'') + " ${host} ${builtins.concatStringsSep " " args}"
)
nfsHosts
);
data_format = "influx";
}];

2
roles/zfs.nix
View file

@ -1,4 +1,4 @@
{...}: {
{ ... }: {
services.zfs = {
autoSnapshot.enable = true;
# defaults to 12, which is a bit much given how much data is written

41
services/hydra/default.nix
View file

@ -1,8 +1,9 @@
{ hydra }:
{ lib, pkgs, config, ... }:
with lib;
let
{ hydra }: { lib
, pkgs
, config
, ...
}:
with lib; let
cfg = config;
hydraPort = 3000;
@ -53,16 +54,17 @@ in
unfreeRedistributable
issl
];
allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"cudnn_cudatoolkit"
"cudatoolkit"
];
allowUnfreePredicate = pkg:
builtins.elem (lib.getName pkg) [
"cudnn_cudatoolkit"
"cudatoolkit"
];
};
services.hydra.package = hydra.defaultPackage.${pkgs.system};
sops.secrets.nix-community-cachix.sopsFile = ../../roles/nix-community-cache.yaml;
sops.secrets.id_buildfarm = {};
sops.secrets.id_buildfarm = { };
services.hydra = {
enable = true;
@ -71,19 +73,24 @@ in
port = hydraPort;
useSubstitutes = true;
adminPasswordFile = config.sops.secrets.hydra-admin-password.path;
buildMachinesFiles = [
(pkgs.writeText "builders" ''
localhost x86_64-linux,builtin - 8 1 nixos-test,big-parallel,kvm -
ssh://nix@build04.nix-community.org aarch64-linux ${config.sops.secrets.id_buildfarm.path} 4 1 nixos-test,big-parallel,kvm -
'')
];
usersFile = config.sops.secrets.hydra-users.path;
extraConfig = ''
max_output_size = ${builtins.toString (8 * 1024 * 1024 * 1024)}
'';
};
nix = {
distributedBuilds = true;
buildMachines = [
{
hostName = "localhost";
systems = [ "x86_64-linux" "builtin" ];
maxJobs = 8;
supportedFeatures = [ "nixos-test" "big-parallel" "kvm" ];
}
];
};
services.postgresql = {
enable = true;
settings = {

3
users/adisbladis.nix
View file

@ -12,7 +12,8 @@ in
useDefaultShell = true;
isNormalUser = true;
extraGroups = [
"wheel" "trusted"
"wheel"
"trusted"
];
uid = userLib.mkUid "adis";
};

3
users/flokli.nix
View file

@ -11,7 +11,8 @@ in
useDefaultShell = true;
isNormalUser = true;
extraGroups = [
"wheel" "trusted"
"wheel"
"trusted"
];
uid = userLib.mkUid "flok";
};

3
users/lewo.nix
View file

@ -11,7 +11,8 @@ in
useDefaultShell = true;
isNormalUser = true;
extraGroups = [
"wheel" "trusted"
"wheel"
"trusted"
];
uid = userLib.mkUid "lewo";
};

3
users/mic92.nix
View file

@ -11,7 +11,8 @@ in
useDefaultShell = true;
isNormalUser = true;
extraGroups = [
"wheel" "trusted"
"wheel"
"trusted"
];
uid = userLib.mkUid "micc";
};

3
users/ryantm.nix
View file

@ -12,7 +12,8 @@ in
useDefaultShell = true;
isNormalUser = true;
extraGroups = [
"wheel" "trusted"
"wheel"
"trusted"
];
uid = userLib.mkUid "rytm";
};

3
users/zimbatm.nix
View file

@ -13,7 +13,8 @@ in
useDefaultShell = true;
isNormalUser = true;
extraGroups = [
"wheel" "trusted"
"wheel"
"trusted"
];
uid = userLib.mkUid "zimb";
};