diff options
| author | ene <ene@sils.li> | 2023-03-20 15:07:15 +0100 |
|---|---|---|
| committer | ene <ene@sils.li> | 2023-03-20 15:07:15 +0100 |
| commit | c3b22b5f2825a0c25879f2661d722e8bb026637a (patch) | |
| tree | 32b4eff83c0bd0b6cd35a431f9c5aaba3e535ae6 | |
| parent | Merge branch 'server1_mail' into server1_develop (diff) | |
| parent | Revert "Fix(hosts/server1/networking): Remove ipv6 route" (diff) | |
| download | nixos-server-c3b22b5f2825a0c25879f2661d722e8bb026637a.tar.gz nixos-server-c3b22b5f2825a0c25879f2661d722e8bb026637a.zip | |
Merge branch 'server1_hardware' into server1_develop
| -rw-r--r-- | hosts/server1/configuration.nix | 3 | ||||
| -rw-r--r-- | hosts/server1/hardware.nix (renamed from system/hardware/default.nix) | 4 | ||||
| -rw-r--r-- | system/default.nix | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix index 694b6b4..891c5dc 100644 --- a/hosts/server1/configuration.nix +++ b/hosts/server1/configuration.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { imports = [ ./networking.nix # network configuration that just works + ./hardware.nix ../../system ]; @@ -10,7 +11,7 @@ networking.hostName = "server1"; networking.domain = "vhack.eu"; - system.fileSystemLayouts.mainDisk = "/dev/vda3"; + system.fileSystemLayouts.mainDisk = "/dev/disk/by-uuid/7d960eb9-9334-4aef-9f7c-9a908a91a6db"; system.stateVersion = "22.11"; } diff --git a/system/hardware/default.nix b/hosts/server1/hardware.nix index c4c7dc9..9fabafe 100644 --- a/system/hardware/default.nix +++ b/hosts/server1/hardware.nix @@ -4,6 +4,6 @@ (modulesPath + "/profiles/headless.nix") ]; boot.loader.grub.device = "/dev/vda"; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; - boot.initrd.kernelModules = ["nvme" "btrfs"]; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"]; + boot.initrd.kernelModules = []; } diff --git a/system/default.nix b/system/default.nix index 9aa5d9e..d67ada2 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,7 +1,6 @@ {config, ...}: { imports = [ ./file_system_layouts - ./hardware ./packages ./services ./users |