From 44cf2b96e29c13a3b1885492dd9eb80764cbd753 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sun, 5 Nov 2023 18:40:04 +0100 Subject: [PATCH] add HDDs to yodaHedgehog --- hosts/yodaHedgehog/configuration.nix | 2 +- hosts/yodaHedgehog/hardware-configuration.nix | 20 +++++++++++++------ hosts/yodaHedgehog/host-specific.nix | 6 ++++-- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/hosts/yodaHedgehog/configuration.nix b/hosts/yodaHedgehog/configuration.nix index ca7b97b..80f8079 100644 --- a/hosts/yodaHedgehog/configuration.nix +++ b/hosts/yodaHedgehog/configuration.nix @@ -58,7 +58,7 @@ networking.hostName = "yodaHedgehog"; boot.initrd.luks.devices."crypted".allowDiscards = true; - yoda.btrfsFileSystems = ["/"]; + yoda.btrfsFileSystems = ["/" "/mnt/backup"]; #yoda.btrfsMounts = yoda.btrfsFileSystems; boot.kernelParams = []; diff --git a/hosts/yodaHedgehog/hardware-configuration.nix b/hosts/yodaHedgehog/hardware-configuration.nix index d3e10f7..eea5f40 100644 --- a/hosts/yodaHedgehog/hardware-configuration.nix +++ b/hosts/yodaHedgehog/hardware-configuration.nix @@ -8,7 +8,7 @@ [ (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.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; @@ -21,17 +21,25 @@ 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" = { device = "/dev/disk/by-uuid/4d413255-2c52-4b69-9be1-179e28f1b67e"; fsType = "btrfs"; 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"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/hosts/yodaHedgehog/host-specific.nix b/hosts/yodaHedgehog/host-specific.nix index c5e0144..c6ce147 100644 --- a/hosts/yodaHedgehog/host-specific.nix +++ b/hosts/yodaHedgehog/host-specific.nix @@ -5,8 +5,10 @@ # sudo systemctl suspend # Power consumption: - # 2.4W powered off - # 2.6W suspended, with 1 RAM, 1 SSD + # 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 HDDs + # 18.9W idle, with 1 RAM, 1 SSD, 2 HDDs # journalctl -u regular-wakeup