nixpkgs-fmt

This commit is contained in:
oxapentane - 2022-08-24 18:48:33 +02:00
parent d073065f25
commit 1fb49e2b8b
Signed by: oxapentane
GPG Key ID: 91FA5E5BF9AA901C
11 changed files with 132 additions and 120 deletions

View File

@ -82,7 +82,8 @@
);
id_list = [
{ # Barkhausen Bau
{
# Barkhausen Bau
id = 0;
arch = "x86_64-linux";
extraModules = [
@ -90,7 +91,8 @@
diskModule
];
}
{ # Zentralwerk
{
# Zentralwerk
id = 1;
arch = "x86_64-linux";
extraModules = [
@ -98,7 +100,8 @@
diskModule
];
}
{ # Chemnitz
{
# Chemnitz
id = 2;
arch = "x86_64-linux";
extraModules = [

View File

@ -9,7 +9,8 @@
networking.interfaces.eth0.useDHCP = true;
sdImage = lib.mkForce {
populateFirmwareCommands = let
populateFirmwareCommands =
let
configTxt = pkgs.writeText "config.txt" ''
[pi3]
kernel=u-boot-rpi3.bin
@ -49,7 +50,8 @@
# when attempting to show low-voltage or overtemperature warnings.
avoid_warnings=1
'';
in ''
in
''
(cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/)
# Add the config

View File

@ -1,7 +1,8 @@
{ config, ... }:
let
service_number = 1;
in {
in
{
dump-dvb.api = {
enable = true;
GRPC = {

View File

@ -1,7 +1,8 @@
{ config, ... }:
let
serice_number = 2;
in {
in
{
dump-dvb.funnel = {
enable = true;
GRPC = {

View File

@ -105,14 +105,16 @@ let format' = format; in let
raw = "img";
}.${format} or format;
rootPartition = { # switch-case
rootPartition = {
# switch-case
legacy = "1";
"legacy+gpt" = "2";
efi = "2";
hybrid = "3";
}.${partitionTableType};
partitionDiskScript = { # switch-case
partitionDiskScript = {
# switch-case
legacy = ''
parted --script $diskImage -- \
mklabel msdos \
@ -162,7 +164,8 @@ let format' = format; in let
'';
binPath = with pkgs; makeBinPath (
[ rsync
[
rsync
util-linux
parted
e2fsprogs
@ -171,7 +174,8 @@ let format' = format; in let
config.system.build.nixos-enter
nix
systemdMinimal
] ++ stdenv.initialPath);
] ++ stdenv.initialPath
);
# I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate
# image building logic. The comment right below this now appears in 4 different places in nixpkgs :)
@ -373,7 +377,8 @@ let format' = format; in let
'';
buildImage = pkgs.vmTools.runInLinuxVM (
pkgs.runCommand name {
pkgs.runCommand name
{
preVM = prepareImage;
buildInputs = with pkgs; [ util-linux e2fsprogs dosfstools ];
postVM = moveOrConvertImage + postVM;