hitagi: Reinstall on single drive

This commit is contained in:
Simon Bruder 2023-05-24 16:27:39 +02:00
parent 9724413740
commit dc0a64a44e
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
2 changed files with 5 additions and 32 deletions

View file

@ -8,9 +8,7 @@ Custom build in a be quiet! Pure Base 500.
* CPU: AMD Ryzen 7 5800X * CPU: AMD Ryzen 7 5800X
* RAM: 2×16GB G.Skill Aegis DDR4-3200 CL16 (not because it is anything special) * RAM: 2×16GB G.Skill Aegis DDR4-3200 CL16 (not because it is anything special)
* PSU: be quiet! System Power 10 750W * PSU: be quiet! System Power 10 750W
* Main SSD: 250GB Samsung 970 Evo Pro NVMe * SSD: 1TB Samsung 980 Pro NVMe
* Secondary SSD: 256GB micron MTFDDAK256TBN-1AR15ABHA SATA
* HDD: 2TB Toshiba HDWA120
* GPU: Intel Arc A770 Limited Edition (16GB VRAM) * GPU: Intel Arc A770 Limited Edition (16GB VRAM)
* Case fans: 2 be quiet! Pure Wings 2 140mm (included in case), 3 more with PWM * Case fans: 2 be quiet! Pure Wings 2 140mm (included in case), 3 more with PWM
* CPU Cooler: Noctua NH-U12S with an additional NF-F12 PWM * CPU Cooler: Noctua NH-U12S with an additional NF-F12 PWM

View file

@ -26,7 +26,7 @@
luks.devices = { luks.devices = {
root = { root = {
name = "root"; name = "root";
device = "/dev/disk/by-uuid/1607bb2a-329b-4252-b11a-b43eb6b7bf0c"; device = "/dev/disk/by-uuid/63c6aa7c-47c5-43f5-b0eb-c32b0768327b";
preLVM = true; preLVM = true;
allowDiscards = true; allowDiscards = true;
}; };
@ -36,44 +36,19 @@
fileSystems = { fileSystems = {
"/" = { "/" = {
device = "/dev/disk/by-uuid/9e6b279e-6995-44da-b673-21b9e23a5278"; device = "/dev/disk/by-uuid/3994f497-9848-459e-9642-cbc14a7d3c97";
fsType = "btrfs"; fsType = "btrfs";
options = [ "discard=async" "noatime" "compress=zstd" ]; options = [ "discard=async" "noatime" "compress=zstd" ];
}; };
"/boot" = { "/boot" = {
device = "/dev/disk/by-uuid/75DA-DFE2"; device = "/dev/disk/by-uuid/96B6-34BD";
fsType = "vfat"; fsType = "vfat";
}; };
"/data" = {
device = "/dev/mapper/data";
fsType = "btrfs";
options = [ "compress=zstd" ];
encrypted = {
label = "data";
enable = true;
blkDev = "/dev/disk/by-uuid/7f4ba71e-3aca-4294-b37f-49f37b584dbd";
keyFile = "/mnt-root/root/luks-data";
};
};
"/data/ssd" = {
device = "/dev/mapper/data-ssd";
fsType = "btrfs";
options = [ "discard=async" "noatime" "compress=zstd" ];
encrypted = {
# !!! HACK
label = "data-ssd --allow-discards";
enable = true;
blkDev = "/dev/disk/by-uuid/41baa168-7fa0-4eb3-b314-50766ddf126d";
keyFile = "/mnt-root/root/luks-data";
};
};
}; };
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-uuid/2774d182-ddc9-4d79-886e-995fcd60a88a"; } { device = "/dev/disk/by-uuid/98de7ced-4d7c-4915-bf5b-1a0300458ea6"; }
]; ];
# GPU # GPU