diff --git a/machines/ray/configuration.nix b/machines/ray/configuration.nix index c140442..03e54b1 100644 --- a/machines/ray/configuration.nix +++ b/machines/ray/configuration.nix @@ -24,7 +24,7 @@ in efi.enable = true; boot.initrd.luks.devices."enc-pv" = { - device = "/dev/disk/by-uuid/d71ebe1f-7c49-454d-b28b-1dc54cf280e5"; + device = "/dev/disk/by-uuid/c1822e5f-4137-44e1-885f-954e926583ce"; allowDiscards = true; }; @@ -32,11 +32,6 @@ in hardware.enableAllFirmware = true; - boot.blacklistedKernelModules = [ "btusb" ]; - - # fix backlight - boot.kernelParams = [ "amdgpu.backlight=0" ]; - # newer kernel for wifi boot.kernelPackages = pkgs.linuxKernel.packages.linux_5_15; diff --git a/machines/ray/hardware-configuration.nix b/machines/ray/hardware-configuration.nix index b92a90e..5a91ad8 100644 --- a/machines/ray/hardware-configuration.nix +++ b/machines/ray/hardware-configuration.nix @@ -14,26 +14,28 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/4ba62b93-d30e-4638-b68f-c830e6edde48"; + { device = "/dev/vg/root"; fsType = "btrfs"; options = [ "subvol=root" ]; }; fileSystems."/home" = - { device = "/dev/disk/by-uuid/4ba62b93-d30e-4638-b68f-c830e6edde48"; + { device = "/dev/vg/root"; fsType = "btrfs"; options = [ "subvol=home" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4CD3-6ED6"; + { device = "/dev/disk/by-uuid/2C85-2B59"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/2aee96fd-5132-480f-a798-c6b87be2ffd9"; } + [ { device = "/dev/vg/swap"; } ]; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + # high-resolution display hardware.video.hidpi.enable = lib.mkDefault true; }