refactor(zulip01): remove disko dependencies
All checks were successful
Check meta / check_meta (push) Successful in 15s
Check meta / check_meta (pull_request) Successful in 15s
Check meta / check_dns (pull_request) Successful in 17s
Check meta / check_dns (push) Successful in 18s
Check workflows / check_workflows (push) Successful in 19s
Check workflows / check_workflows (pull_request) Successful in 19s
Build all the nodes / Jaccess01 (pull_request) Successful in 26s
Build all the nodes / Jaccess04 (pull_request) Successful in 31s
Run pre-commit on all files / pre-commit (push) Successful in 32s
Run pre-commit on all files / pre-commit (pull_request) Successful in 34s
Build all the nodes / netcore01 (pull_request) Successful in 31s
Build all the nodes / netcore02 (pull_request) Successful in 34s
Build all the nodes / ap01 (pull_request) Successful in 46s
Build all the nodes / geo02 (pull_request) Successful in 52s
Build the shell / build-shell (pull_request) Successful in 29s
Build all the nodes / bridge01 (pull_request) Successful in 1m1s
Build all the nodes / hypervisor02 (pull_request) Successful in 1m1s
Build all the nodes / geo01 (pull_request) Successful in 1m5s
Build all the nodes / hypervisor01 (pull_request) Successful in 1m5s
Build all the nodes / cof02 (pull_request) Successful in 1m7s
Build all the nodes / build01 (pull_request) Successful in 1m8s
Build all the nodes / lab-router01 (pull_request) Successful in 1m1s
Build all the nodes / hypervisor03 (pull_request) Successful in 1m10s
Build all the nodes / tower01 (pull_request) Successful in 1m6s
Build all the nodes / web02 (pull_request) Successful in 1m16s
Build all the nodes / web03 (pull_request) Successful in 1m15s
Build all the nodes / iso (pull_request) Successful in 1m30s
Build all the nodes / compute01 (pull_request) Successful in 1m45s
Build all the nodes / vault01 (pull_request) Successful in 1m30s
Build all the nodes / zulip01 (pull_request) Successful in 1m29s
Build all the nodes / rescue01 (pull_request) Successful in 1m35s
Build all the nodes / web01 (pull_request) Successful in 1m33s
Build all the nodes / storage01 (pull_request) Successful in 1m52s
Build all the nodes / krz01 (pull_request) Successful in 1m56s

This commit is contained in:
catvayor 2025-06-12 15:36:09 +02:00 committed by thubrecht
parent 2038a06f21
commit c384f800b3
2 changed files with 20 additions and 46 deletions

View file

@ -1,17 +1,10 @@
# SPDX-FileCopyrightText: 2024 Tom Hubrecht <tom.hubrecht@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
# 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
];
boot = {
@ -19,8 +12,8 @@
availableKernelModules = [
"ata_piix"
"uhci_hcd"
"ehci_pci"
"virtio_pci"
"virtio_scsi"
"sr_mod"
"virtio_blk"
];
@ -30,4 +23,22 @@
kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/179ba756-b0f0-42ec-b0b5-ab3daca97d3d";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/0DB8-F2E0";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
};
swapDevices = [ ];
}

View file

@ -1,37 +0,0 @@
# SPDX-FileCopyrightText: 2024 Maurice Debray <maurice.debray@dgnum.eu>
#
# SPDX-License-Identifier: EUPL-1.2
_: {
disko.devices = {
disk = {
main = {
device = "/dev/sda";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "1G";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
};
};
}