2 files changed, 27 insertions, 13 deletions
diff --git a/hosts/apzu/hardware/default.nix b/hosts/apzu/hardware/default.nix
index bd7241b3..b11cf522 100644
--- a/hosts/apzu/hardware/default.nix
+++ b/hosts/apzu/hardware/default.nix
@@ -11,18 +11,22 @@
     ./gpu.nix
   ];
 
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  nixpkgs.hostPlatform = "x86_64-linux";
 
   system.fileSystemLayouts = {
     enable = true;
-    mainDisk = "/dev/disk/by-uuid/<uuid>";
-    efiDisk = "/dev/disk/by-uuid/<uuid>";
+    mainDisk = "/dev/disk/by-uuid/4211a4ff-f2e9-41ed-83ca-712830fd0254";
+    efiDisk = "/dev/disk/by-uuid/2BFA-8F0F";
+    ssd = true;
+    swap = {
+      uuid = "4211a4ff-f2e9-41ed-83ca-712830fd0254";
+      resumeOffset = "533760";
+    };
   };
 
   boot = {
-    kernelModules = ["kvm-amd"];
+    kernelModules = ["kvm-amd" "rtw89"];
 
-    # TODO check this:
-    initrd.availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"];
+    initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
   };
 }
diff --git a/hosts/apzu/hardware/gpu.nix b/hosts/apzu/hardware/gpu.nix
index c3df51ae..180695e8 100644
--- a/hosts/apzu/hardware/gpu.nix
+++ b/hosts/apzu/hardware/gpu.nix
@@ -4,12 +4,22 @@
   lib,
   ...
 }: {
-  hardware.opengl.extraPackages = with pkgs; [
-    rocm-opencl-icd # open-cl
-    amdvlk # or directly through mesa
-    amd-media-driver # libva
-  ];
+  #   hardware.opengl.extraPackages = with pkgs; [
+  #     rocm-opencl-icd # open-cl
+  #     amdvlk # or directly through mesa
+  #     amd-media-driver # libva
+  #   ];
+  #
+  #   # Force radv, TODO is this logical?
+  #   environment.variables.AMD_VULKAN_ICD = "RADV";
 
-  # Force radv, TODO is this logical?
-  environment.variables.AMD_VULKAN_ICD = "RADV";
+  hardware.opengl = {
+    enable = true;
+    extraPackages = with pkgs; [
+      vaapiVdpau
+      libvdpau-va-gl
+
+      #amdvlk # or directly through mesa
+    ];
+  };
 }