refactor(web01): remove disko dependencies
Some checks failed
Build all the nodes / geo01 (pull_request) Successful in 57s
Build all the nodes / netcore02 (pull_request) Successful in 27s
Build all the nodes / build01 (pull_request) Successful in 1m4s
Build all the nodes / geo02 (pull_request) Successful in 56s
Build all the nodes / hypervisor02 (pull_request) Successful in 56s
Build all the nodes / hypervisor03 (pull_request) Successful in 56s
Build all the nodes / hypervisor01 (pull_request) Successful in 58s
Build all the nodes / lab-router01 (pull_request) Successful in 59s
Build all the nodes / iso (pull_request) Successful in 1m12s
Build all the nodes / compute01 (pull_request) Successful in 1m25s
Build all the nodes / tower01 (pull_request) Successful in 52s
Build the shell / build-shell (pull_request) Successful in 30s
Build all the nodes / vault01 (pull_request) Successful in 1m2s
Build all the nodes / web02 (pull_request) Successful in 52s
Build all the nodes / rescue01 (pull_request) Successful in 1m12s
Build all the nodes / zulip01 (pull_request) Successful in 50s
Build all the nodes / krz01 (pull_request) Successful in 1m43s
Build all the nodes / web03 (pull_request) Successful in 1m7s
Build all the nodes / web01 (pull_request) Successful in 1m28s
Build all the nodes / storage01 (pull_request) Successful in 1m50s
Run pre-commit on all files / pre-commit (push) Has been cancelled
Run pre-commit on all files / pre-commit (pull_request) Successful in 37s
Check meta / check_dns (pull_request) Successful in 17s
Check meta / check_meta (pull_request) Successful in 18s
Check workflows / check_workflows (pull_request) Successful in 18s
Build all the nodes / Jaccess01 (pull_request) Successful in 23s
Build all the nodes / Jaccess04 (pull_request) Successful in 25s
Build all the nodes / ap01 (pull_request) Successful in 44s
Build all the nodes / bridge01 (pull_request) Successful in 50s
Build all the nodes / netcore01 (pull_request) Successful in 25s
Build all the nodes / cof02 (pull_request) Successful in 1m0s
Some checks failed
Build all the nodes / geo01 (pull_request) Successful in 57s
Build all the nodes / netcore02 (pull_request) Successful in 27s
Build all the nodes / build01 (pull_request) Successful in 1m4s
Build all the nodes / geo02 (pull_request) Successful in 56s
Build all the nodes / hypervisor02 (pull_request) Successful in 56s
Build all the nodes / hypervisor03 (pull_request) Successful in 56s
Build all the nodes / hypervisor01 (pull_request) Successful in 58s
Build all the nodes / lab-router01 (pull_request) Successful in 59s
Build all the nodes / iso (pull_request) Successful in 1m12s
Build all the nodes / compute01 (pull_request) Successful in 1m25s
Build all the nodes / tower01 (pull_request) Successful in 52s
Build the shell / build-shell (pull_request) Successful in 30s
Build all the nodes / vault01 (pull_request) Successful in 1m2s
Build all the nodes / web02 (pull_request) Successful in 52s
Build all the nodes / rescue01 (pull_request) Successful in 1m12s
Build all the nodes / zulip01 (pull_request) Successful in 50s
Build all the nodes / krz01 (pull_request) Successful in 1m43s
Build all the nodes / web03 (pull_request) Successful in 1m7s
Build all the nodes / web01 (pull_request) Successful in 1m28s
Build all the nodes / storage01 (pull_request) Successful in 1m50s
Run pre-commit on all files / pre-commit (push) Has been cancelled
Run pre-commit on all files / pre-commit (pull_request) Successful in 37s
Check meta / check_dns (pull_request) Successful in 17s
Check meta / check_meta (pull_request) Successful in 18s
Check workflows / check_workflows (pull_request) Successful in 18s
Build all the nodes / Jaccess01 (pull_request) Successful in 23s
Build all the nodes / Jaccess04 (pull_request) Successful in 25s
Build all the nodes / ap01 (pull_request) Successful in 44s
Build all the nodes / bridge01 (pull_request) Successful in 50s
Build all the nodes / netcore01 (pull_request) Successful in 25s
Build all the nodes / cof02 (pull_request) Successful in 1m0s
This commit is contained in:
parent
1ae7676d4e
commit
db47388c34
2 changed files with 65 additions and 93 deletions
|
@ -1,12 +1,70 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ modulesPath, sources, ... }:
|
||||
|
||||
{ modulesPath, ... }:
|
||||
{
|
||||
imports = [
|
||||
"${modulesPath}/profiles/qemu-guest.nix"
|
||||
"${sources.disko}/module.nix"
|
||||
./disko.nix
|
||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
||||
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [
|
||||
"ata_piix"
|
||||
"uhci_hcd"
|
||||
"ehci_pci"
|
||||
"virtio_pci"
|
||||
"ahci"
|
||||
"virtio_blk"
|
||||
];
|
||||
kernelModules = [ ];
|
||||
luks.devices."mainfs" = {
|
||||
device = "/dev/disk/by-uuid/0de6ce5a-c5b6-41e3-96d0-c0381e06f94e";
|
||||
keyFile = "/dev/zero";
|
||||
keyFileSize = 1;
|
||||
};
|
||||
};
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=rootfs" ];
|
||||
};
|
||||
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
"/var/log" = {
|
||||
device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=var-log" ];
|
||||
};
|
||||
|
||||
"/mnt/btrfs-root" = {
|
||||
device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
"/home" = {
|
||||
device = "/dev/disk/by-uuid/cf7f8271-c1c7-46d9-b960-281d9271c576";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/2A58-A5B0";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/9c2f1161-dc30-4bda-91aa-859bb4ec1697"; } ];
|
||||
}
|
||||
|
|
|
@ -1,86 +0,0 @@
|
|||
# SPDX-FileCopyrightText: 2024 Maurice Debray <maurice.debray@dgnum.eu>
|
||||
#
|
||||
# SPDX-License-Identifier: EUPL-1.2
|
||||
|
||||
_:
|
||||
|
||||
let
|
||||
luksName = "mainfs";
|
||||
in
|
||||
{
|
||||
boot.initrd.luks.devices.${luksName} = {
|
||||
keyFile = "/dev/zero";
|
||||
keyFileSize = 1;
|
||||
};
|
||||
disko.devices = {
|
||||
disk = {
|
||||
vdb = {
|
||||
device = "/dev/vdb";
|
||||
type = "disk";
|
||||
content = {
|
||||
type = "gpt";
|
||||
partitions = {
|
||||
ESP = {
|
||||
start = "1MiB";
|
||||
label = "ESP";
|
||||
end = "512MiB";
|
||||
type = "EF00";
|
||||
priority = 1;
|
||||
content = {
|
||||
type = "filesystem";
|
||||
format = "vfat";
|
||||
mountpoint = "/boot";
|
||||
};
|
||||
};
|
||||
luks = {
|
||||
start = "512MiB";
|
||||
end = "-4GiB";
|
||||
content = rec {
|
||||
type = "luks";
|
||||
name = luksName;
|
||||
extraOpenArgs = [ "--keyfile-size=1" ];
|
||||
extraFormatArgs = extraOpenArgs;
|
||||
settings.keyFile = "/dev/zero";
|
||||
content = {
|
||||
type = "btrfs";
|
||||
mountpoint = "/mnt/btrfs-root";
|
||||
subvolumes = {
|
||||
"/rootfs" = {
|
||||
mountpoint = "/";
|
||||
mountOptions = [ "compress=zstd" ];
|
||||
};
|
||||
"/home" = {
|
||||
mountOptions = [ "compress=zstd" ];
|
||||
mountpoint = "/home";
|
||||
};
|
||||
"/var-log" = {
|
||||
mountOptions = [ "compress=zstd" ];
|
||||
mountpoint = "/var/log";
|
||||
};
|
||||
"/nix" = {
|
||||
mountOptions = [
|
||||
"noatime"
|
||||
"compress=zstd"
|
||||
];
|
||||
mountpoint = "/nix";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
swap = {
|
||||
label = "swap";
|
||||
start = "-4GiB";
|
||||
end = "100%";
|
||||
priority = 3;
|
||||
content = {
|
||||
type = "swap";
|
||||
randomEncryption = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue