hans/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Factorise hardware config of vm02179 into infra/common

Browse source
This commit is contained in:
Nicolas Jeannerod 2024-11-20 16:06:44 +01:00
parent ba8c1d9d9c
commit 6d0c8caf57
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
3 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
infra/common/hardware.nix
View file

@ -1,4 +1,8 @@
{ modulesPath, ... }:
{ {
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot = { boot = {
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
@ -9,6 +13,9 @@
availableKernelModules = [ availableKernelModules = [
"ata_piix" "ata_piix"
"uhci_hcd" "uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod" "sr_mod"
"xen_blkfront" "xen_blkfront"
]; ];

4
infra/vm02179/configuration.nix
View file

@ -9,10 +9,6 @@
ip6 = "2a00:51c0:12:1201::179"; ip6 = "2a00:51c0:12:1201::179";
}; };
# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Set your time zone. # Set your time zone.
time.timeZone = "Europe/Amsterdam"; time.timeZone = "Europe/Amsterdam";

26
infra/vm02179/hardware-configuration.nix
View file

@ -1,23 +1,6 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ { lib, ... }:
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ lib, modulesPath, ... }:
{ {
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
boot.initrd.availableKernelModules = [
"ata_piix"
"uhci_hcd"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241"; device = "/dev/disk/by-uuid/119863f8-55cf-4e2f-ac17-27599a63f241";
fsType = "ext4"; fsType = "ext4";
@ -32,14 +15,7 @@
]; ];
}; };
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.ens18.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
} }