temperance: add filesystem options

This commit is contained in:
Charlie Root 2024-09-20 22:55:26 +02:00
commit 45f94f09df
2 changed files with 8 additions and 28 deletions

View file

@ -1,9 +1,9 @@
{ {
config = { config = {
boot.initrd.luks.devices."cryptroot".device = "/dev/disk-by-uuid/"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/96e8f3d6-8d2d-4e2d-abd9-3eb7f48fed02";
fileSystems = { fileSystems = {
"/boot" = { "/boot" = {
device = ""; device = "7825-451F";
fsType = "vfat"; fsType = "vfat";
}; };
# root on tmpfs # root on tmpfs
@ -13,23 +13,24 @@
options = ["defaults" "size=25%" "mode=755"]; options = ["defaults" "size=25%" "mode=755"];
}; };
"/nix" = { "/nix" = {
device = ""; device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=nix" "compress=zstd" "noatime"]; options = ["subvol=nix" "compress=zstd" "noatime"];
}; };
"/persist" = { "/persist" = {
device = ""; device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
neededForBoot = true; neededForBoot = true;
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=persist" "compress=zstd" "noatime"]; options = ["subvol=persist" "compress=zstd" "noatime"];
}; };
"/home" = { "/home" = {
device = "";
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=home" "compress=zstd" "noatime"]; options = ["subvol=home" "compress=zstd" "noatime"];
}; };
"/swap" = { "/swap" = {
device = ""; device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
fsType = "btrfs"; fsType = "btrfs";
options = ["subvol=swap" "compress=lzo" "noatime"]; options = ["subvol=swap" "compress=lzo" "noatime"];

View file

@ -1,7 +1,6 @@
{ {
config, config,
lib, lib,
pkgs,
modulesPath, modulesPath,
... ...
}: { }: {
@ -9,29 +8,9 @@
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"]; boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [];
boot.kernelModules = ["kvm-intel"]; boot.kernelModules = [];
boot.extraModulePackages = []; boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/0423508a-6906-4872-baeb-2b1e6bd017a4";
fsType = "ext4";
options = ["noatime" "nodiratime" "discard"];
};
boot.initrd.luks.devices."luks-c03fc486-bdd7-46bf-ac2f-1a55fe1abd6f".device = "/dev/disk/by-uuid/c03fc486-bdd7-46bf-ac2f-1a55fe1abd6f";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/D299-5174";
fsType = "vfat";
};
swapDevices = [
{
device = "/var/lib/swapfile";
size = 16 * 1024;
}
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction