Merge branch 'main' of codeberg.org:muon/home

This commit is contained in:
muon 2025-01-02 11:54:15 +00:00
commit e7ec6753ea
2 changed files with 41 additions and 5 deletions

View file

@ -8,10 +8,10 @@
boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.initrd.kernelModules = [ "usb_storage" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
boot.supportedFilesystems = [ "zfs" "ntfs" ];
boot.supportedFilesystems = [ "zfs" "ntfs" "btrfs" ];
services.zfs.autoScrub.enable = true;
services.zfs.autoSnapshot.enable = true;
@ -26,9 +26,43 @@
options = [ "fmask=0077" "dmask=0077" ];
};
fileSystems."/storage0" = {
device = "storage0";
fsType = "zfs";
boot.initrd.luks.devices = let
keyFile =
"/dev/disk/by-id/usb-Kingston_DataTraveler_3.0_60A44C3FB1A2BE91997103B3-0:0";
in {
cura = {
device = "/dev/disk/by-id/ata-WDC_WD30EZRZ-22Z5HB0_WD-WCC4N2RR7YNU-part1";
allowDiscards = true;
keyFileSize = 4096;
keyFile = keyFile;
};
curb = {
device = "/dev/disk/by-id/ata-WDC_WD30EZRZ-22Z5HB0_WD-WCC4N2RR70YJ-part1";
allowDiscards = true;
keyFileSize = 4096;
keyFile = keyFile;
};
curc = {
device = "/dev/disk/by-id/ata-WDC_WD30EZRZ-22Z5HB0_WD-WCC4N2RR7NZT-part1";
allowDiscards = true;
keyFileSize = 4096;
keyFile = keyFile;
};
curd = {
device = "/dev/disk/by-id/ata-WDC_WD30EZRZ-22Z5HB0_WD-WCC4N4FSYUC3-part1";
allowDiscards = true;
keyFileSize = 4096;
keyFile = keyFile;
};
};
services.btrfs.autoScrub.enable = true;
services.btrfs.autoScrub.interval = "weekly";
fileSystems."/curr" = {
device = "/dev/disk/by-uuid/9067ce83-2520-4543-8b7f-38949e1b8b8b";
fsType = "btrfs";
options = [ "subvol=base" "compress=zstd" "noatime" ];
};
fileSystems."/storage1" = {