add HDDs to yodaHedgehog

This commit is contained in:
Daniel Langbein 2023-11-05 18:40:04 +01:00
parent 797253fe53
commit 44cf2b96e2
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
3 changed files with 19 additions and 9 deletions

View File

@ -58,7 +58,7 @@
networking.hostName = "yodaHedgehog"; networking.hostName = "yodaHedgehog";
boot.initrd.luks.devices."crypted".allowDiscards = true; boot.initrd.luks.devices."crypted".allowDiscards = true;
yoda.btrfsFileSystems = ["/"]; yoda.btrfsFileSystems = ["/" "/mnt/backup"];
#yoda.btrfsMounts = yoda.btrfsFileSystems; #yoda.btrfsMounts = yoda.btrfsFileSystems;
boot.kernelParams = []; boot.kernelParams = [];

View File

@ -8,7 +8,7 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@ -21,17 +21,25 @@
boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/5ecf0d68-24fc-49ee-8a78-23b47f3c566c"; boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/5ecf0d68-24fc-49ee-8a78-23b47f3c566c";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/81A5-B98A";
fsType = "vfat";
};
fileSystems."/swap" = fileSystems."/swap" =
{ device = "/dev/disk/by-uuid/4d413255-2c52-4b69-9be1-179e28f1b67e"; { device = "/dev/disk/by-uuid/4d413255-2c52-4b69-9be1-179e28f1b67e";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@swap" ]; options = [ "subvol=@swap" ];
}; };
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/81A5-B98A";
fsType = "vfat";
};
fileSystems."/mnt/backup" =
{ device = "/dev/disk/by-uuid/ea3295df-0107-43dc-90c9-8c3f5558463e";
fsType = "btrfs";
};
boot.initrd.luks.devices."6tb1".device = "/dev/disk/by-id/ata-WDC_WD60EFAX-68SHWN0_WD-WX31D29924PZ-part1";
boot.initrd.luks.devices."6tb2".device = "/dev/disk/by-id/ata-ST6000DM003-2CY186_ZR11WA9K-part1";
swapDevices = [ { device = "/swap/swapfile"; } ]; swapDevices = [ { device = "/swap/swapfile"; } ];
# 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

View File

@ -5,8 +5,10 @@
# sudo systemctl suspend # sudo systemctl suspend
# Power consumption: # Power consumption:
# 2.4W powered off # 2.4W powered off, with 1 RAM, 1 SSD
# 2.6W suspended, with 1 RAM, 1 SSD # 2.6W suspended, with 1 RAM, 1 SSD
# 2.6W suspended, with 1 RAM, 1 SSD, 2 HDDs
# 18.9W idle, with 1 RAM, 1 SSD, 2 HDDs
# journalctl -u regular-wakeup # journalctl -u regular-wakeup