redo hardware-rpi5 nixos-modules

Author: esselius

nixos-configurations/adama.nix

@@ -5,7 +5,6 @@
 
   imports = [
     ezModules.authentik-blueprints
-    ezModules.hardware-rpi5
     ezModules.sshd
     ezModules.user-peteresselius
     ezModules.ca
@@ -20,6 +19,10 @@
   context = "home";
   formfactor = "server";
 
+  hardware-rpi5 = {
+    enable = true;
+  };
+
   networking.firewall.allowedTCPPorts = [
     443 # Nginx
     # 1880 # Node-RED
@@ -183,7 +186,7 @@
   ];
 
   profiles.monitoring = {
-    enable = false;
+    enable = true;
     domain = "grafana.adama.lan";
     root_url = "https://grafana.adama.lan/";
     oauth = {
@@ -196,8 +199,9 @@
     };
   };
   services.prometheus = {
+    enable = true;
     scrapeConfigs = [
-      { job_name = "starbuck-node-exporter"; static_configs = [{ targets = [ "starbuck:9100" ]; }]; }
+      { job_name = "starbuck"; static_configs = [{ targets = [ "starbuck:9090" ]; }]; }
       { job_name = "openwrt"; static_configs = [{ targets = [ "192.168.1.1:9100" "192.168.1.2:9100" ]; }]; }
     ];
   };

nixos-configurations/starbuck.nix

@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ezModules.hardware-rpi5
     ezModules.sshd
     ezModules.user-peteresselius
     ezModules.nix-gc
@@ -15,10 +14,16 @@
   context = "home";
   formfactor = "server";
 
+  profiles.telemetry.enable = true;
+
   networking.firewall.allowedTCPPorts = [
-    9100
+    9090
   ];
 
-  profiles.storage.enable = true;
-  profiles.telemetry.enable = true;
+  hardware-rpi5 = {
+    enable = true;
+    enableNVMe = true;
+    enablePCIeGen3 = true;
+    enableMaxUSBCurrent = true;
+  };
 }

nixos-modules/default.nix

@@ -7,5 +7,6 @@
     ezModules.nix
     ezModules.profiles
     ../overlays.nix
+    ezModules.hardware-rpi5
   ];
 }

nixos-modules/hardware-rpi5.nix

@@ -1,26 +1,56 @@
-{ inputs, ... }:
+{ inputs, lib, config, ... }:
 
+let
+  cfg = config.hardware-rpi5;
+in
 {
   imports = [
     inputs.raspberry-pi-nix.nixosModules.raspberry-pi
   ];
 
-  raspberry-pi-nix = {
-    uboot.enable = false;
-    pin-inputs.enable = true;
-    board = "bcm2712";
-    libcamera-overlay.enable = false;
+  options.hardware-rpi5 = {
+    enable = lib.mkEnableOption "Enable extra Raspberry Pi 5 hardware features";
+    enableNVMe = lib.mkEnableOption "Enable NVMe support";
+    enablePCIeGen3 = lib.mkEnableOption "Enable PCIe Gen3 support";
+    enableMaxUSBCurrent = lib.mkEnableOption "Enable maximum USB current";
   };
 
-  hardware = {
-    bluetooth = {
-      enable = true;
-      settings.General.Experimental = true;
+  config = lib.mkIf cfg.enable {
+    raspberry-pi-nix = {
+      uboot.enable = false;
+      pin-inputs.enable = true;
+      board = "bcm2712";
+      libcamera-overlay.enable = false;
     };
 
-    raspberry-pi.config.all.base-dt-params.krnbt = {
-      enable = true;
-      value = "on";
+    hardware = {
+      bluetooth = {
+        enable = true;
+        settings.General.Experimental = true;
+      };
+
+      raspberry-pi.config.all = {
+        options.usb_max_current_enable = lib.mkIf cfg.enableMaxUSBCurrent {
+          enable = true;
+          value = 1;
+        };
+
+        base-dt-params = {
+          krnbt = {
+            enable = true;
+            value = "on";
+          };
+
+          nvme = lib.mkIf cfg.enableNVMe {
+            enable = true;
+          };
+
+          pciex1_1 = lib.mkIf cfg.enablePCIeGen3 {
+            enable = true;
+            value = "gen3";
+          };
+        };
+      };
     };
   };
 }

nixos-modules/profiles/telemetry.nix

@@ -16,6 +16,7 @@ in
       exporters = {
         node = {
           enable = true;
+          openFirewall = true;
           enabledCollectors = [
             "cgroups"
             "systemd"