From 09393d500d97754b6ddec5d41a1dd972e35b8f9a Mon Sep 17 00:00:00 2001
From: "Reid \"reidlab" <reidlab325@gmail.com>
Date: Fri, 31 May 2024 15:59:35 -0700
Subject: [PATCH] refactor hardware a little

---
 .../apple-macbook-air-9-1.nix                 | 52 +++++++++++++++++++
 hosts/goopnet-interface/hardware.nix          | 52 +------------------
 2 files changed, 54 insertions(+), 50 deletions(-)
 create mode 100644 hosts/goopnet-interface/apple-macbook-air-9-1.nix

diff --git a/hosts/goopnet-interface/apple-macbook-air-9-1.nix b/hosts/goopnet-interface/apple-macbook-air-9-1.nix
new file mode 100644
index 0000000..6ee508f
--- /dev/null
+++ b/hosts/goopnet-interface/apple-macbook-air-9-1.nix
@@ -0,0 +1,52 @@
+{ pkgs, ... }:
+{
+  # support power features such as suspend to ram
+  powerManagement.enable = true;
+  # tune power saving options on boot
+  powerManagement.powertop.enable = true;
+  # thermald proactively prevents overheating on intel CPUs and works well with other tools
+  services.thermald.enable = true;
+  # power-profile-daemon for power management
+  services.power-profiles-daemon.enable = true;
+  # manage fans for macbook devices
+  services.mbpfan.enable = true;
+
+  # better performance than the actual intel driver
+  services.xserver.videoDrivers = [ "modesetting" ];
+
+  # needed for our broadcom/brcm 4377b chip to work
+  hardware.firmware = with pkgs; [
+    my.apple-firmware
+  ];
+
+  # VA-API
+  hardware.opengl = {
+    extraPackages = with pkgs; [
+      intel-media-driver
+      intel-vaapi-driver
+      libvdpau-va-gl
+    ];
+
+    extraPackages32 = with pkgs.pkgsi686Linux; [
+      intel-media-driver
+      intel-vaapi-driver
+      libvdpau-va-gl
+    ];
+  };
+
+  environment.variables = {
+    LIBVA_DRIVER_NAME= "iHD";
+    VDPAU_DRIVER = "va_gl";
+    # VA-API on firefox
+    MOZ_DISABLE_RDD_SANDBOX = "1";
+  };
+
+  environment.systemPackages = with pkgs; [ intel-gpu-tools ];
+
+  boot.kernelParams = [
+    # enable the i915 sandybridge framebuffer compression (475mw savings)
+    "i915.i915_enable_fbc=1"
+    "i915.fastboot=1"
+    "enable_gvt=1"
+  ];
+}
\ No newline at end of file
diff --git a/hosts/goopnet-interface/hardware.nix b/hosts/goopnet-interface/hardware.nix
index d381e74..18f19f6 100755
--- a/hosts/goopnet-interface/hardware.nix
+++ b/hosts/goopnet-interface/hardware.nix
@@ -12,6 +12,8 @@
       inputs.hardware.nixosModules.apple-t2
     
       (modulesPath + "/installer/scan/not-detected.nix")
+
+      ./apple-macbook-air-9-1.nix
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
@@ -26,56 +28,6 @@
     efi.canTouchEfiVariables = true;
   };
 
-  # support power features such as suspend to ram
-  powerManagement.enable = true;
-  # tune power saving options on boot
-  powerManagement.powertop.enable = true;
-  # thermald proactively prevents overheating on intel CPUs and works well with other tools
-  services.thermald.enable = true;
-  # power-profile-daemon for power management
-  services.power-profiles-daemon.enable = true;
-  # manage fans for macbook devices
-  services.mbpfan.enable = true;
-
-  # better performance than the actual intel driver
-  services.xserver.videoDrivers = [ "modesetting" ];
-
-  # needed for our broadcom/brcm 4377b chip to work
-  hardware.firmware = with pkgs; [
-    my.apple-firmware
-  ];
-
-  # VA-API
-  hardware.opengl = {
-    extraPackages = with pkgs; [
-      intel-media-driver
-      intel-vaapi-driver
-      libvdpau-va-gl
-    ];
-
-    extraPackages32 = with pkgs.pkgsi686Linux; [
-      intel-media-driver
-      intel-vaapi-driver
-      libvdpau-va-gl
-    ];
-  };
-
-  environment.variables = {
-    LIBVA_DRIVER_NAME= "iHD";
-    VDPAU_DRIVER = "va_gl";
-    # VA-API on firefox
-    MOZ_DISABLE_RDD_SANDBOX = "1";
-  };
-
-  environment.systemPackages = with pkgs; [ intel-gpu-tools ];
-
-  boot.kernelParams = [
-    # enable the i915 sandybridge framebuffer compression (475mw savings)
-    "i915.i915_enable_fbc=1"
-    "i915.fastboot=1"
-    "enable_gvt=1"
-  ];
-
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/0f09afdc-88e4-4764-818b-77828931278f";
       fsType = "ext4";