From 01be4d89a085df3d84e01416c19cd4db8e25f023 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <dfullmer@anduril.com>
Date: Fri, 4 Nov 2022 09:56:01 -0700
Subject: [PATCH] Move modules into subdir

---
 default.nix                                        |  4 ++--
 flake.nix                                          |  4 ++--
 module.nix => modules/default.nix                  | 14 +++++++++-----
 .../flash-script.nix                               |  0
 .../nvargus-daemon.nix                             |  0
 .../nvfancontrol.nix                               |  0
 nvpmodel-module.nix => modules/nvpmodel.nix        |  0
 7 files changed, 13 insertions(+), 9 deletions(-)
 rename module.nix => modules/default.nix (94%)
 rename flash-script-module.nix => modules/flash-script.nix (100%)
 rename nvargus-daemon-module.nix => modules/nvargus-daemon.nix (100%)
 rename nvfancontrol-module.nix => modules/nvfancontrol.nix (100%)
 rename nvpmodel-module.nix => modules/nvpmodel.nix (100%)

diff --git a/default.nix b/default.nix
index c71a1b36..08623be6 100644
--- a/default.nix
+++ b/default.nix
@@ -104,12 +104,12 @@ in rec {
       # Use cross-compiled machine here so we don't have to depend on aarch64 builders
       # TODO: Do a smaller cross-compiled version from old jetpack dir
       dtbsDir = (pkgsAarch64.nixos {
-        imports = [ ./module.nix ];
+        imports = [ ./modules/default.nix ];
         hardware.nvidia-jetpack.enable = true;
       }).config.hardware.deviceTree.package;
     };
   } // (builtins.listToAttrs (map (n: lib.nameValuePair "flash-${n}" (flashScriptFromNixos (pkgs.nixos {
-    imports = [ ./module.nix (./. + "/profiles/${n}.nix") ];
+    imports = [ ./modules/default.nix (./. + "/profiles/${n}.nix") ];
     hardware.nvidia-jetpack.enable = true;
     networking.hostName = n; # Just so it sets 
   }).config)) [
diff --git a/flake.nix b/flake.nix
index 72df561c..bff51a3a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
     installer_minimal_config = {
       imports = [
         "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
-        ./module.nix
+        ./modules/default.nix
       ];
       # Avoids a bunch of extra modules we don't have in the tegra_defconfig, like "ata_piix",
       disabledModules = [ "profiles/all-hardware.nix" ];
@@ -25,7 +25,7 @@
       installer_minimal_cross = nixpkgs.legacyPackages.x86_64-linux.pkgsCross.aarch64-multiplatform.nixos installer_minimal_config;
     };
 
-    nixosModules.default = import ./module.nix;
+    nixosModules.default = import ./modules/default.nix;
 
     overlays.default = import ./overlay.nix;
 
diff --git a/module.nix b/modules/default.nix
similarity index 94%
rename from module.nix
rename to modules/default.nix
index 7d2cfc2d..d1b7ca9d 100644
--- a/module.nix
+++ b/modules/default.nix
@@ -15,10 +15,10 @@ in
 {
   imports = [
     # https://developer.ridgerun.com/wiki/index.php/Xavier/JetPack_5.0.2/Performance_Tuning
-    ./nvpmodel-module.nix
-    ./nvfancontrol-module.nix
-    ./nvargus-daemon-module.nix
-    ./flash-script-module.nix
+    ./nvpmodel.nix
+    ./nvfancontrol.nix
+    ./nvargus-daemon.nix
+    ./flash-script.nix
   ];
 
   options = {
@@ -30,11 +30,15 @@ in
         type = types.bool;
         description = "Always run at maximum clock speed";
       };
+
+      chip = mkOption {
+        default = "generic";
+      };
     };
   };
 
   config = mkIf cfg.enable {
-    nixpkgs.overlays = [ (import ./overlay.nix) ];
+    nixpkgs.overlays = [ (import ../overlay.nix) ];
 
     boot.kernelPackages = pkgs.nvidia-jetpack.kernelPackages;
 
diff --git a/flash-script-module.nix b/modules/flash-script.nix
similarity index 100%
rename from flash-script-module.nix
rename to modules/flash-script.nix
diff --git a/nvargus-daemon-module.nix b/modules/nvargus-daemon.nix
similarity index 100%
rename from nvargus-daemon-module.nix
rename to modules/nvargus-daemon.nix
diff --git a/nvfancontrol-module.nix b/modules/nvfancontrol.nix
similarity index 100%
rename from nvfancontrol-module.nix
rename to modules/nvfancontrol.nix
diff --git a/nvpmodel-module.nix b/modules/nvpmodel.nix
similarity index 100%
rename from nvpmodel-module.nix
rename to modules/nvpmodel.nix