Move modules into subdir

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)) [

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;
 

module.nix → 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;