From c18b633ea92993a48f4a61f46547b2c3955b3f91 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 21 Nov 2021 14:06:42 -0500
Subject: [PATCH] hardware/form: move raspi configuration

---
 hosts/Infini-RPI/default.nix      |  7 ++-----
 modules/modules/hardware/form.nix | 35 ++++++++++++++++++++++++++++++-
 profiles/hardware/rpi.nix         | 32 ----------------------------
 3 files changed, 36 insertions(+), 38 deletions(-)
 delete mode 100644 profiles/hardware/rpi.nix

diff --git a/hosts/Infini-RPI/default.nix b/hosts/Infini-RPI/default.nix
index 9efa48e..484c024 100644
--- a/hosts/Infini-RPI/default.nix
+++ b/hosts/Infini-RPI/default.nix
@@ -5,12 +5,9 @@
     ])
 
     (with profiles; [
-      (with hardware; [
-        rpi
-        wireless
-      ])
-
       networking.wireless
     ])
   ];
+
+  modules.hardware.form.raspi = true;
 }
diff --git a/modules/modules/hardware/form.nix b/modules/modules/hardware/form.nix
index 082a32a..9ada1cf 100644
--- a/modules/modules/hardware/form.nix
+++ b/modules/modules/hardware/form.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, inputs, ... }:
 with lib;
 with lib.hlissner;
 let
@@ -45,9 +45,42 @@ in
       };
     })
     (mkIf cfg.raspi {
+      imports = [ inputs.nixos-hardware.outputs.nixosModules.raspberry-pi-4 ];
+
       modules.hardware = {
         wireless.enable = mkDefault true;
       };
+
+      boot = {
+        tmpOnTmpfs = true;
+        kernelParams = [
+          "8250.nr_uarts=1"
+          "console=ttyAMA0,115200"
+          "console=tty1"
+        ];
+
+        loader = {
+          raspberryPi = {
+            enable = true;
+            version = 4;
+          };
+
+          grub.enable = false;
+          generic-extlinux-compatible.enable = true;
+        };
+      };
+
+      hardware.raspberry-pi."4" = {
+        fkms-3d.enable = true;
+
+        audio.enable = config.modules.hardware.audio.enable;
+      };
+
+      powerManagement.cpuFreqGovernor = "ondemand";
+
+      environment.systemPackages = with pkgs; [
+        raspberrypi-eeprom
+      ];
     })
     (mkIf cfg.server { })
   ];
diff --git a/profiles/hardware/rpi.nix b/profiles/hardware/rpi.nix
deleted file mode 100644
index 3723c1f..0000000
--- a/profiles/hardware/rpi.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, lib, inputs, ... }: {
-  imports = [ inputs.nixos-hardware.outputs.nixosModules.raspberry-pi-4 ];
-
-  boot = {
-    tmpOnTmpfs = true;
-    kernelParams = [
-      "8250.nr_uarts=1"
-      "console=ttyAMA0,115200"
-      "console=tty1"
-    ];
-
-    loader = {
-      raspberryPi = {
-        enable = true;
-        version = 4;
-      };
-
-      grub.enable = false;
-      generic-extlinux-compatible.enable = true;
-    };
-  };
-
-  hardware.raspberry-pi."4" = {
-    fkms-3d.enable = true;
-  };
-
-  powerManagement.cpuFreqGovernor = "ondemand";
-
-  environment.systemPackages = with pkgs; [
-    raspberrypi-eeprom
-  ];
-}