new install config

This commit is contained in:
Christoph Cullmann 2023-07-28 17:36:50 +02:00
parent eef82e220e
commit 8ee8426f88
2 changed files with 13 additions and 17 deletions

View file

@ -8,7 +8,7 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ];
boot.initrd.kernelModules = [ "i915" ]; boot.initrd.kernelModules = [ "i915" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -20,32 +20,24 @@
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/D6ED-7B8C"; { device = "/dev/disk/by-uuid/F1C1-0271";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/boot-fallback" = boot.initrd.luks.devices."crypt-system".device = "/dev/disk/by-uuid/2dc54953-958b-4c5a-8454-21c0b1d16222";
{ device = "/dev/disk/by-uuid/D6ED-BC4A"; boot.initrd.luks.devices."crypt-system".allowDiscards = true;
fsType = "vfat"; boot.initrd.luks.devices."crypt-system".bypassWorkqueues = true;
};
boot.initrd.luks.devices."crypt-disk1".device = "/dev/disk/by-uuid/d24c36a7-d39c-4de5-8fc0-33ff0262e964";
boot.initrd.luks.devices."crypt-disk1".allowDiscards = true;
boot.initrd.luks.devices."crypt-disk1".bypassWorkqueues = true;
boot.initrd.luks.devices."crypt-disk2".device = "/dev/disk/by-uuid/cde8caa0-be38-4ff8-a3b3-aa82bc587550";
boot.initrd.luks.devices."crypt-disk2".allowDiscards = true;
boot.initrd.luks.devices."crypt-disk2".bypassWorkqueues = true;
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/mapper/crypt-disk1"; { device = "/dev/mapper/crypt-system";
fsType = "btrfs"; fsType = "btrfs";
options = [ "device=/dev/mapper/crypt-disk2" "subvol=nix" "noatime" "compress=zstd" ]; options = [ "subvol=nix" "noatime" "compress=zstd" ];
}; };
fileSystems."/data" = fileSystems."/data" =
{ device = "/dev/mapper/crypt-disk1"; { device = "/dev/mapper/crypt-system";
fsType = "btrfs"; fsType = "btrfs";
options = [ "device=/dev/mapper/crypt-disk2" "subvol=data" "noatime" "compress=zstd" ]; options = [ "subvol=data" "noatime" "compress=zstd" ];
}; };
fileSystems."/home" = fileSystems."/home" =

View file

@ -80,6 +80,10 @@ nixos-generate-config --root /mnt
# save /mnt/etc/nixos/hardware-configuration.nix /mnt/etc/nixos/configuration.nix # save /mnt/etc/nixos/hardware-configuration.nix /mnt/etc/nixos/configuration.nix
cp /mnt/etc/nixos/hardware-configuration.nix /tmp
cp /mnt/etc/nixos/configuration.nix /tmp
# copy data # copy data