architect: update hardware mounts after nvme switch
This commit is contained in:
parent
ab02bf1d41
commit
3b9da24177
@ -1,48 +1,24 @@
|
||||
# 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.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/28ce6650-de21-4c1d-ae42-95d1e3507740";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/B790-869D";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
fileSystems."/media" = {
|
||||
device = "datapool/media";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/secrets" = {
|
||||
device = "backedpool/secrets";
|
||||
fsType = "zfs";
|
||||
};
|
||||
|
||||
fileSystems."/services" = {
|
||||
device = "backedpool/services";
|
||||
fsType = "zfs";
|
||||
};
|
||||
swapDevices = [{
|
||||
device = "/swapfile";
|
||||
size = 1024 * 64;
|
||||
}];
|
||||
environment.etc."crypttab".text = ''
|
||||
backedNvme /dev/disk/by-uuid/92cfaa4a-82a1-4336-b552-b7f4f3c68613 /newdrive.key
|
||||
'';
|
||||
|
||||
boot = {
|
||||
initrd.luks.devices = {
|
||||
kernelModules = [ "kvm-amd" "dm-snapshot" ];
|
||||
initrd = {
|
||||
luks.devices = {
|
||||
# backedNvme = {
|
||||
# device = "/dev/disk/by-uuid/92cfaa4a-82a1-4336-b552-b7f4f3c68613";
|
||||
# keyFile = "/newdrive.key";
|
||||
# allowDiscards = true;
|
||||
|
||||
# };
|
||||
root = {
|
||||
device = "/dev/disk/by-uuid/bdd5f111-ecec-48d8-861f-94083098c724";
|
||||
preLVM = true;
|
||||
@ -50,8 +26,44 @@
|
||||
fallbackToPassword = true;
|
||||
};
|
||||
};
|
||||
initrd.availableKernelModules =
|
||||
availableKernelModules =
|
||||
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
initrd.kernelModules = [ "dm-snapshot" ];
|
||||
};
|
||||
};
|
||||
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/28ce6650-de21-4c1d-ae42-95d1e3507740";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/B790-869D";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
"/backednvme" = {
|
||||
device = "/dev/mapper/backedNvme";
|
||||
};
|
||||
|
||||
"/services" = {
|
||||
device = "/backednvme/services";
|
||||
options = [ "bind" ];
|
||||
};
|
||||
|
||||
"/secrets" = {
|
||||
device = "/backednvme/secrets";
|
||||
options = [ "bind" ];
|
||||
};
|
||||
|
||||
"/media" = {
|
||||
device = "nvmedata/media";
|
||||
fsType = "zfs";
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [{
|
||||
device = "/swapfile";
|
||||
size = 1024 * 64;
|
||||
}];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user