simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

Reorganise hardware configuration

Browse source 
Fixes #6.
This commit is contained in:
Simon Bruder 2020-12-06 11:03:23 +01:00
parent 30a54af123
commit 61e61f0908
No known key found for this signature in database
GPG key ID: 6F03E0000CC5B62F
4 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
machines/nunotaba/configuration.nix
View file

@ -20,16 +20,5 @@
}; };
}; };
boot.loader.grub.device = "/dev/disk/by-id/ata-INTEL_SSDSC2KB480G7_PHYS749202D6480BGN";
boot.initrd.luks.devices = {
root = {
name = "root";
device = "/dev/disk/by-uuid/f3a2fa57-581b-4e95-9a45-d61cda9edc54";
preLVM = true;
allowDiscards = true;
};
};
networking.hostName = "nunotaba"; networking.hostName = "nunotaba";
} }

9
machines/nunotaba/hardware-configuration.nix
View file

@ -8,9 +8,18 @@
boot = { boot = {
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
loader.grub.device = "/dev/disk/by-id/ata-INTEL_SSDSC2KB480G7_PHYS749202D6480BGN";
initrd = { initrd = {
availableKernelModules = [ "ahci" "ehci_pci" "rtsx_pci_sdmmc" "sd_mod" "usb_storage" "usbhid" "xhci_pci" ]; availableKernelModules = [ "ahci" "ehci_pci" "rtsx_pci_sdmmc" "sd_mod" "usb_storage" "usbhid" "xhci_pci" ];
kernelModules = [ "dm-snapshot" ]; kernelModules = [ "dm-snapshot" ];
luks.devices = {
root = {
name = "root";
device = "/dev/disk/by-uuid/f3a2fa57-581b-4e95-9a45-d61cda9edc54";
preLVM = true;
allowDiscards = true;
};
};
}; };
}; };

22
machines/sayuri/configuration.nix
View file

@ -20,27 +20,5 @@
}; };
}; };
boot.loader.grub.device = "/dev/disk/by-id/ata-MTFDDAK256TBN-1AR15ABHA_UFZMQ01ZR50NMM";
boot.initrd.luks.devices = {
root = {
name = "root";
device = "/dev/disk/by-uuid/d7e4d213-8a13-4059-a011-0f68081e86d8";
preLVM = true;
allowDiscards = true;
};
};
fileSystems.data = {
mountPoint = "/data";
device = "/dev/mapper/data";
encrypted = {
label = "data";
enable = true;
blkDev = "/dev/disk/by-uuid/576088d4-9aae-4159-a028-feadb2621a1a";
keyFile = "/mnt-root" + toString ./secrets/data_luks_key;
};
};
networking.hostName = "sayuri"; networking.hostName = "sayuri";
} }

19
machines/sayuri/hardware-configuration.nix
View file

@ -8,9 +8,18 @@
boot = { boot = {
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
extraModulePackages = [ ]; extraModulePackages = [ ];
loader.grub.device = "/dev/disk/by-id/ata-MTFDDAK256TBN-1AR15ABHA_UFZMQ01ZR50NMM";
initrd = { initrd = {
availableKernelModules = [ "ahci" "ehci_pci" "sd_mod" "usb_storage" "usbhid" "xhci_pci" ]; availableKernelModules = [ "ahci" "ehci_pci" "sd_mod" "usb_storage" "usbhid" "xhci_pci" ];
kernelModules = [ "dm-snapshot" ]; kernelModules = [ "dm-snapshot" ];
luks.devices = {
root = {
name = "root";
device = "/dev/disk/by-uuid/d7e4d213-8a13-4059-a011-0f68081e86d8";
preLVM = true;
allowDiscards = true;
};
};
}; };
}; };
@ -24,6 +33,16 @@
device = "/dev/disk/by-uuid/c5bde64b-c629-438d-a78b-c4341796dae9"; device = "/dev/disk/by-uuid/c5bde64b-c629-438d-a78b-c4341796dae9";
fsType = "ext2"; fsType = "ext2";
}; };
"/data" = {
device = "/dev/mapper/data";
encrypted = {
label = "data";
enable = true;
blkDev = "/dev/disk/by-uuid/576088d4-9aae-4159-a028-feadb2621a1a";
keyFile = "/mnt-root" + toString ./secrets/data_luks_key;
};
};
}; };
swapDevices = [ swapDevices = [