diff --git a/hosts/europa/hardware-configuration.nix b/hosts/europa/hardware-configuration.nix index d450a3c..deb3aab 100644 --- a/hosts/europa/hardware-configuration.nix +++ b/hosts/europa/hardware-configuration.nix @@ -1,72 +1,36 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = - [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "uas" "sd_mod" ]; + [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = { - device = "rpool/nixos"; - fsType = "zfs"; + device = "/dev/disk/by-uuid/4b758b9b-4c75-4658-9649-64a2ceba2a0b"; + fsType = "ext4"; }; - fileSystems."/nix" = { - device = "rpool/nixos/nix"; - fsType = "zfs"; - }; + boot.initrd.luks.devices."luks-1f16b568-7726-44b6-b082-6b9d5e4d1972".device = + "/dev/disk/by-uuid/1f16b568-7726-44b6-b082-6b9d5e4d1972"; - fileSystems."/etc" = { - device = "rpool/nixos/etc"; - fsType = "zfs"; - }; - - fileSystems."/var" = { - device = "rpool/nixos/var"; - fsType = "zfs"; - }; - - fileSystems."/var/lib" = { - device = "rpool/nixos/var/lib"; - fsType = "zfs"; - }; - - fileSystems."/var/log" = { - device = "rpool/nixos/var/log"; - fsType = "zfs"; - }; - - fileSystems."/var/spool" = { - device = "rpool/nixos/var/spool"; - fsType = "zfs"; - }; - - fileSystems."/home" = { - device = "rpool/nixos/home"; - fsType = "zfs"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5250-11DE"; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/F0A2-4A56"; fsType = "vfat"; }; - swapDevices = [ ]; - # needed for hibernate - #swapDevices = - # [{ device = "/dev/disk/by-uuid/6e56876e-bd04-4fbb-9ff7-5202cbf5eaa4"; }]; + swapDevices = + [{ device = "/dev/disk/by-uuid/60ad662b-b126-427e-b36b-85f091d99491"; }]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware = { - cpu.intel.updateMicrocode = config.hardware.enableRedistributableFirmware; + cpu.intel.updateMicrocode = + lib.mkDefault config.hardware.enableRedistributableFirmware; acpilight.enable = true; - video.hidpi.enable = true; + video.hidpi.enable = lib.mkDefault true; bluetooth.enable = true; }; }