From 7c8b26c07cfeca90c07a6271d717014e9de4fbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= Date: Wed, 20 Nov 2024 16:09:22 +0100 Subject: [PATCH] Factorise hardware config of vm02187 into `infra/common` --- infra/vm02187/configuration.nix | 4 ---- infra/vm02187/hardware-configuration.nix | 26 +----------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/infra/vm02187/configuration.nix b/infra/vm02187/configuration.nix index 4304bd2..3c58f39 100644 --- a/infra/vm02187/configuration.nix +++ b/infra/vm02187/configuration.nix @@ -9,10 +9,6 @@ ip6 = "2a00:51c0:12:1201::187"; }; - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - services.phpfpm.pools.mediawiki.phpOptions = '' upload_max_filesize = 1024M; post_max_size = 1024M; diff --git a/infra/vm02187/hardware-configuration.nix b/infra/vm02187/hardware-configuration.nix index 79f182e..24a8a49 100644 --- a/infra/vm02187/hardware-configuration.nix +++ b/infra/vm02187/hardware-configuration.nix @@ -1,23 +1,6 @@ -# 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. -{ lib, modulesPath, ... }: +{ lib, ... }: { - 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."/" = { device = "/dev/disk/by-uuid/a46a9c46-e32b-4216-a4aa-8819b2cd0d49"; 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..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens18.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; }