chore: format with alejandra

This commit is contained in:
steveej 2023-02-07 18:24:28 +01:00
parent 05f0cbdfb4
commit 89f5f65f2d
181 changed files with 2720 additions and 2560 deletions

View file

@ -1,15 +1,22 @@
{ system ? builtins.currentSystem, vmPkgsPath, buildPkgsPath, nixosConfigPath }:
{
system ? builtins.currentSystem,
vmPkgsPath,
buildPkgsPath,
nixosConfigPath,
}: let
buildPkgs = import buildPkgsPath {};
vmPkgs' = import vmPkgsPath {};
vmPkgs =
vmPkgs'
// {
runtimeShell = "${vmPkgs'.bash}/${vmPkgs'.bash.shellPath}";
};
let
buildPkgs = import buildPkgsPath { };
vmPkgs' = import vmPkgsPath { };
vmPkgs = vmPkgs' // {
runtimeShell = "${vmPkgs'.bash}/${vmPkgs'.bash.shellPath}";
};
importWithPkgs = { path, pkgs }:
args:
import path (args // { inherit pkgs; });
importWithPkgs = {
path,
pkgs,
}: args:
import path (args // {inherit pkgs;});
nixosConfig = importWithPkgs {
path = "${nixosConfigPath}";
@ -24,12 +31,13 @@ let
pkgs = null;
};
vmWithBootLoaderConfigMixed = (evalConfig {
modules = [
nixosConfig
vmConfig
{ virtualisation.useBootLoader = true; }
];
}).config;
in { vmWithBootLoaderMixed = vmWithBootLoaderConfigMixed.system.build.vm; }
vmWithBootLoaderConfigMixed =
(evalConfig {
modules = [
nixosConfig
vmConfig
{virtualisation.useBootLoader = true;}
];
})
.config;
in {vmWithBootLoaderMixed = vmWithBootLoaderConfigMixed.system.build.vm;}

View file

@ -1,6 +1,8 @@
{ pkgs, lib, ... }:
let
{
pkgs,
lib,
...
}: let
in {
boot.loader.grub = {
enable = true;
@ -12,20 +14,21 @@ in {
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.enable = true;
boot.initrd.luks.devices = [{
name = "crypt";
device = "/dev/disk/uuid/463d886d-7dfe-421b-8cef-f9af3a3fa09d";
preLVM = true;
allowDiscards = true;
}];
fileSystems."/" = { label = "root"; };
boot.initrd.luks.devices = [
{
name = "crypt";
device = "/dev/disk/uuid/463d886d-7dfe-421b-8cef-f9af3a3fa09d";
preLVM = true;
allowDiscards = true;
}
];
fileSystems."/" = {label = "root";};
fileSystems."/boot" = { label = "boot"; };
fileSystems."/boot" = {label = "boot";};
boot.tmpOnTmpfs = true;
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
users.extraUsers.root.initialPassword = lib.mkForce "toorroot";
users.mutableUsers = false;

View file

@ -1,4 +1,10 @@
{ lib, config, pkgs, fetchgit, ... }: {
{
lib,
config,
pkgs,
fetchgit,
...
}: {
boot.consoleLogLevel = 6;
users.users.root.initialPassword = "root";
systemd.services."serial-getty@ttyS0".enable = true;