Restructure partition config

lib/modules/fileSystems.nix

@@ -0,0 +1,27 @@
+{ lib, config, ... }:
+let
+  inherit (lib) types mkOption;
+in {
+  imports = [
+    ./partition/disks.nix
+  ];
+
+  options = {
+    valhalla = {
+      fileSystems = {
+        script = mkOption {
+          type = types.str;
+          description = "The script for preparing the system's mounts.";
+        };
+      };
+    };
+  };
+
+  config = {
+    valhalla = {
+      fileSystems = {
+        script = config.valhalla.fileSystems.diskSetup.script;
+      };
+    };
+  };
+}

lib/modules/partition/disks.nix

@@ -291,27 +291,29 @@ in
 {
   options = {
     valhalla = {
-      partition = {
+      fileSystems = {
         rootDir = mkOption {
           type = types.str;
           description = "The root of the installation directory to mount disks into.";
           default = "/mnt";
         };
 
-        os = mkOption {
+        diskSetup = {
-          type = mkDiskType true;
+          osDisk = mkOption {
-          description = "The partition layout of the OS disk.";
+            type = mkDiskType true;
-        };
+            description = "The partition layout of the OS disk.";
+          };
 
-        disks = mkOption {
+          disks = mkOption {
-          type = types.attrsOf (mkDiskType false);
+            type = types.attrsOf (mkDiskType false);
-          description = "The additional disks to format.";
+            description = "The additional disks to format.";
-          default = { };
+            default = { };
-        };
+          };
 
-        script = mkOption {
+          script = mkOption {
-          type = types.str;
+            type = types.str;
-          description = "The script for partitioning the system's disks.";
+            description = "The script for partitioning the system's disks.";
+          };
         };
       };
     };
@@ -319,14 +321,15 @@ in
 
   config = {
     valhalla = {
-      partition = {
+      fileSystems.diskSetup = {
         script = lib.mkDefault (
           let
-            cfg = config.valhalla.partition;
+            cfg = config.valhalla.fileSystems;
-            inherit (cfg) os rootDir;
+            inherit (cfg) rootDir;
+            inherit (cfg.diskSetup) osDisk;
             inherit (lib.strings) normalizePath;
             partPath = part: "/dev/disk/by-label/${part.label}";
-            disks = ([ os ] ++ (builtins.attrValues cfg.disks));
+            disks = ([ osDisk ] ++ (builtins.attrValues cfg.diskSetup.disks));
             partitions = (builtins.concatMap (_: (builtins.attrValues _.partitions)) disks);
 
             mountScript = lib.strings.concatLines (builtins.concatMap

lib/modules/valhalla.nix

@@ -2,6 +2,7 @@
 let inherit (lib) mkOption types;
 in {
   imports = [
+    ./fileSystems.nix
     ./hardware.nix
     ./i18n.nix
     ./os.nix

profiles/machines/manuel/DerGeret/config.nix

@@ -25,7 +25,7 @@
         };
       };
 
-      partition.os.partitions = {
+      fileSystems.diskSetup.osDisk.partitions = {
         # Keep Windows' boot partition
         Boot.keepExisting = true;
 

profiles/machines/manuel/Generic/config.nix

@@ -5,8 +5,8 @@ in {
 
   config = {
     valhalla = {
-      partition = {
+      fileSystems.diskSetup = {
-        os = {
+        osDisk = {
           partitions = {
             Boot = {
               index = 1;

profiles/machines/manuel/server.nix

@@ -5,8 +5,8 @@ in {
 
   config = {
     valhalla = {
-      partition = {
+      fileSystems.diskSetup = {
-        os = {
+        osDisk = {
           partitions = {
             Boot = {
               index = 1;