nixpkgs-fmt

This commit is contained in:
oxapentane - 2022-05-28 21:24:15 +02:00
parent 6c292303da
commit d777425a9c
Signed by: oxapentane
GPG Key ID: 91FA5E5BF9AA901C
5 changed files with 102 additions and 99 deletions

View File

@ -167,7 +167,7 @@
'' ''
)); ));
individualScripts = lib.foldl (x: y: lib.mergeAttrs x y) {} (builtins.map (number: {"deploy-box-${toString number}" = (installScript number);}) id_list); individualScripts = lib.foldl (x: y: lib.mergeAttrs x y) { } (builtins.map (number: { "deploy-box-${toString number}" = (installScript number); }) id_list);
packages = ({ packages = ({
traffic-stop-box = self.nixosConfigurations.traffic-stop-box-0.config.system.build.vm; traffic-stop-box = self.nixosConfigurations.traffic-stop-box-0.config.system.build.vm;

View File

@ -11,31 +11,33 @@
hypervisor = "cloud-hypervisor"; hypervisor = "cloud-hypervisor";
socket = "${config.networking.hostName}.socket"; socket = "${config.networking.hostName}.socket";
interfaces = [ { interfaces = [{
type = "tap"; type = "tap";
id = "staging-dh"; id = "staging-dh";
mac = "00:de:5b:f9:e2:3d"; mac = "00:de:5b:f9:e2:3d";
} ]; }];
shares = [ { shares = [{
source = "/nix/store"; source = "/nix/store";
mountPoint = "/nix/.ro-store"; mountPoint = "/nix/.ro-store";
tag = "store"; tag = "store";
proto = "virtiofs"; proto = "virtiofs";
socket = "store.socket"; socket = "store.socket";
} { }
{
source = "/var/lib/microvms/staging-data-hoarder/etc"; source = "/var/lib/microvms/staging-data-hoarder/etc";
mountPoint = "/etc"; mountPoint = "/etc";
tag = "etc"; tag = "etc";
proto = "virtiofs"; proto = "virtiofs";
socket = "etc.socket"; socket = "etc.socket";
} { }
{
source = "/var/lib/microvms/staging-data-hoarder/var"; source = "/var/lib/microvms/staging-data-hoarder/var";
mountPoint = "/var"; mountPoint = "/var";
tag = "var"; tag = "var";
proto = "virtiofs"; proto = "virtiofs";
socket = "var.socket"; socket = "var.socket";
} ]; }];
}; };
networking.hostName = "staging-data-hoarder"; # Define your hostname. networking.hostName = "staging-data-hoarder"; # Define your hostname.
@ -45,10 +47,10 @@
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
networking.interfaces.eth0 = { networking.interfaces.eth0 = {
useDHCP = false; useDHCP = false;
ipv4.addresses = [ { ipv4.addresses = [{
address = "172.20.73.64"; address = "172.20.73.64";
prefixLength = 25; prefixLength = 25;
} ]; }];
}; };
networking.defaultGateway = "172.20.73.1"; networking.defaultGateway = "172.20.73.1";

View File

@ -14,7 +14,7 @@ let
{ frequency = "170795000"; offset = "19550"; device = "hackrf=0"; } # dresden unused { frequency = "170795000"; offset = "19550"; device = "hackrf=0"; } # dresden unused
]; ];
receiver = pkgs.gnuradio-decode.override(lib.elemAt receiver_config config.dvb-dump.systemNumber); receiver = pkgs.gnuradio-decode.override (lib.elemAt receiver_config config.dvb-dump.systemNumber);
in in
{ {
systemd = { systemd = {

View File

@ -1,4 +1,4 @@
{self, pkgs, lib, boxes}: { self, pkgs, lib, boxes }:
let let
# command which generates the update script for that specific machine # command which generates the update script for that specific machine
installScript = (target: (pkgs.writeScript "deploy" '' installScript = (target: (pkgs.writeScript "deploy" ''
@ -27,9 +27,10 @@ let
'' ''
)); ));
individualScripts = lib.foldl (x: y: lib.mergeAttrs x y) {} (builtins.map (number: {"deploy-box-${toString number}" = (installScript number);}) boxes); individualScripts = lib.foldl (x: y: lib.mergeAttrs x y) { } (builtins.map (number: { "deploy-box-${toString number}" = (installScript number); }) boxes);
in ({ in
({
deploy-all = deployAllScript; deploy-all = deployAllScript;
}) #individualScripts }) #individualScripts