From 16ea0ef1ef2d06a813b807ca8376705ac4673035 Mon Sep 17 00:00:00 2001 From: Anish L Date: Sun, 12 Jun 2022 22:31:44 +1000 Subject: [PATCH] update box hardware --- hosts/box/configuration.nix | 18 ++++++++-------- hosts/box/hardware-configuration.nix | 32 ++++++++++++++++++++-------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/hosts/box/configuration.nix b/hosts/box/configuration.nix index c093ff59..00122ff3 100644 --- a/hosts/box/configuration.nix +++ b/hosts/box/configuration.nix @@ -39,15 +39,15 @@ }; # Data mount - fileSystems."/data" = { - device = "/dev/disk/by-uuid/3276a297-9ee4-4998-b262-1ed100366c06"; # UUID for /dev/mapper/crypted-data - encrypted = { - enable = true; - label = "crypted-data"; - blkDev = "/dev/disk/by-uuid/8a317bf4-fe13-4334-a6df-5fe5a5048b5e"; # UUID for /dev/sda1 - keyFile = "/keyfile1.bin"; - }; - }; + # fileSystems."/data" = { + # device = "/dev/disk/by-uuid/3276a297-9ee4-4998-b262-1ed100366c06"; # UUID for /dev/mapper/crypted-data + # encrypted = { + # enable = true; + # label = "crypted-data"; + # blkDev = "/dev/disk/by-uuid/8a317bf4-fe13-4334-a6df-5fe5a5048b5e"; # UUID for /dev/sda1 + # keyFile = "/keyfile1.bin"; + # }; + # }; networking.interfaces.enp2s0 = { ipv4.addresses = [{ diff --git a/hosts/box/hardware-configuration.nix b/hosts/box/hardware-configuration.nix index 5a3f3976..dd526bfb 100644 --- a/hosts/box/hardware-configuration.nix +++ b/hosts/box/hardware-configuration.nix @@ -5,34 +5,48 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "thunderbolt" "uas" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/ade0752d-84d3-4e39-865b-9027ba2d5c67"; + { + device = "/dev/disk/by-uuid/ade0752d-84d3-4e39-865b-9027ba2d5c67"; fsType = "ext4"; }; fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/1715-278E"; + { + device = "/dev/disk/by-uuid/1715-278E"; fsType = "vfat"; }; - fileSystems."/data" = - { device = "/dev/disk/by-uuid/3276a297-9ee4-4998-b262-1ed100366c06"; + fileSystems."/mnt/one" = + { + device = "/dev/disk/by-uuid/0f857c6e-509d-436f-9e78-bc25f1b0d23b"; fsType = "ext4"; }; - boot.initrd.luks.devices."crypted-data".device = "/dev/disk/by-uuid/8a317bf4-fe13-4334-a6df-5fe5a5048b5e"; + fileSystems."/mnt/two" = + { + device = "/dev/disk/by-uuid/5bc894bf-ed87-4c30-aab4-87e154e0cd08"; + fsType = "ext4"; + }; + + fileSystems."/mnt/three" = + { + device = "/dev/disk/by-uuid/0be3ded1-9c8b-40aa-94ca-dc2297d5988e"; + fsType = "ext4"; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/b790abb4-ba5f-4476-8f09-b0fc575414aa"; } - ]; + [{ device = "/dev/disk/by-uuid/b790abb4-ba5f-4476-8f09-b0fc575414aa"; }]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }