4 files changed, 25 insertions, 63 deletions
diff --git a/hosts/apzu/default.nix b/hosts/apzu/default.nix
index 5b3d23f8..2d26b27b 100644
--- a/hosts/apzu/default.nix
+++ b/hosts/apzu/default.nix
@@ -18,11 +18,15 @@
       backlight = "intel_backlight";
     };
     locale.enable = true;
+
     networking = {
       enable = true;
       mode = "NetworkManager";
       hostName = "apzu";
     };
+    bluetooth = {
+      enable = true;
+    };
     nixpkgs = {
       enable = true;
       systemName = "x86_64-linux";
diff --git a/hosts/apzu/hardware.nix b/hosts/apzu/hardware.nix
index 29223e29..ae204baa 100644
--- a/hosts/apzu/hardware.nix
+++ b/hosts/apzu/hardware.nix
@@ -1,19 +1,22 @@
-{
-  modulesPath,
-  pkgs,
-  ...
-}: {
+{modulesPath, ...}: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary?
   ];
 
-  soispha.disks = {
-    enable = true;
-    disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1";
-    ssd = true;
-    swap = {
-      uuid = "c94cd20a-dd3c-436f-9841-6fe92e5c8719";
-      resumeOffset = "533760";
+  soispha = {
+    disks = {
+      enable = true;
+      disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKNU512GZH_PHKA1481032A512A_1";
+      ssd = true;
+      swap = {
+        uuid = "c94cd20a-dd3c-436f-9841-6fe92e5c8719";
+        resumeOffset = "533760";
+      };
+    };
+
+    hardware = {
+      enable = true;
+      cpuType = "intel";
     };
   };
 
@@ -22,30 +25,4 @@
 
     initrd.availableKernelModules = ["xhci_pci" "vmd" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
   };
-
-  hardware = {
-    bluetooth = {
-      enable = true;
-      # Avoid some battery drain, requires a `power on` in bluetoothctl
-      powerOnBoot = false;
-    };
-
-    #   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";
-
-    cpu.intel.updateMicrocode = true; # Why not?
-    opengl = {
-      enable = true;
-      extraPackages = with pkgs; [
-        vaapiVdpau
-        libvdpau-va-gl
-      ];
-    };
-  };
 }
diff --git a/hosts/tiamat/default.nix b/hosts/tiamat/default.nix
index 06bca3bc..17e2ae9d 100644
--- a/hosts/tiamat/default.nix
+++ b/hosts/tiamat/default.nix
@@ -19,6 +19,9 @@
       mode = "systemd-networkd";
       hostName = "tiamat";
     };
+    bluetooth = {
+      enable = true;
+    };
 
     polkit.enable = true;
     power.enable = true;
diff --git a/hosts/tiamat/hardware.nix b/hosts/tiamat/hardware.nix
index d8e62af0..8ecb4ce0 100644
--- a/hosts/tiamat/hardware.nix
+++ b/hosts/tiamat/hardware.nix
@@ -1,33 +1,9 @@
-{
-  modulesPath,
-  pkgs,
-  ...
-}: {
+{modulesPath, ...}: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix") # TODO: is this necessary?
   ];
 
   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";
-
-    opengl = {
-      enable = true;
-      extraPackages = with pkgs; [
-        vaapiVdpau
-        libvdpau-va-gl
-
-        amdvlk # or directly through mesa
-      ];
-    };
-
-    cpu.amd.updateMicrocode = true; # Why not?
     bluetooth = {
       enable = true;
       powerOnBoot = true;
@@ -37,10 +13,12 @@
   soispha = {
     hardware = {
       enable = true;
+      cpuType = "amd";
       moonlander = {
         enableFlashing = true;
       };
     };
+
     disks = {
       enable = true;
       disk = "/dev/disk/by-id/nvme-CT1000P5SSD8_21032C857568";