Cleaned up storage configuration (#3)

Author: spietras

src/src/hosts/dummy/modules/constants/default.nix

@@ -24,6 +24,18 @@
         type = lib.types.str;
       };
 
+      storage = {
+        disks = {
+          main = {
+            device = lib.mkOption {
+              default = "/dev/sda";
+              description = "Device path of the main disk";
+              type = lib.types.str;
+            };
+          };
+        };
+      };
+
       vm = {
         cpu = {
           cores = lib.mkOption {

src/src/hosts/dummy/modules/install/default.nix

@@ -26,6 +26,7 @@
             # Provide values to substitute
             flake = inputs.self;
             host = config.constants.name;
+            main = config.constants.storage.disks.main.device;
           }
         );
       };

src/src/hosts/dummy/modules/install/install.sh

@@ -4,33 +4,28 @@
 
 FLAKE='@flake@'
 HOST='@host@'
+MAIN='@main@'
 
 ### HELPER FUNCTIONS ###
 
 print_usage() {
 	# Print script usage
 
 	cat <<EOF
-Usage: $0 --main DEVICE [-k KEYFILE] [OPTIONS]
+Usage: $0 [-k KEYFILE] [OPTIONS]
 Install the system on this machine.
 
-    --main                  path to the device with the main disk
 	-k, --keyfile           path to the age key file
 EOF
 }
 
 ### PARSE ARGUMENTS ###
 
-main=''
 keyfile="${SOPS_AGE_KEY_FILE:-${SOPS_AGE_KEY_DIR:-${XDG_CONFIG_HOME:-${HOME}/.config}/sops/age}/keys.txt}"
 unparsed=''
 
 while [[ -n ${1:-} ]]; do
 	case "$1" in
-	--main)
-		shift
-		main="$1"
-		;;
 	-k | --keyfile)
 		shift
 		keyfile="$1"
@@ -52,29 +47,17 @@ done
 # shellcheck disable=SC2086
 set -- ${unparsed}
 
-if [[ -z ${main} ]]; then
-	printf '%s\n' 'Error: --main is required.' >&2
-	print_usage >&2
-	exit 1
-fi
-
-if [[ ! -e ${main} ]]; then
-	printf '%s\n' "Error: Device ${main} does not exist." >&2
-	print_usage >&2
-	exit 2
-fi
-
 if [[ ! -e ${keyfile} ]]; then
 	printf '%s\n' "Error: Key file ${keyfile} does not exist." >&2
 	print_usage >&2
-	exit 3
+	exit 1
 fi
 
 ### MAIN ###
 
 disko-install \
 	--flake "${FLAKE}#${HOST}" \
-	--disk main "${main}" \
+	--disk main "${MAIN}" \
 	--extra-files "${keyfile}" /var/lib/sops/age/keys.txt \
 	--write-efi-boot-entries \
 	"$@"

src/src/hosts/dummy/modules/storage/default.nix

@@ -1,5 +1,9 @@
 # Storage configuration
-{inputs, ...}: {
+{
+  config,
+  inputs,
+  ...
+}: {
   imports = [
     # Import Disko modules
     inputs.disko.nixosModules.disko
@@ -10,46 +14,52 @@
       disk = {
         main = {
           content = {
-            # Use GPT partition table
-            type = "gpt";
-
             partitions = {
               boot = {
-                # Size of the boot partition
-                size = "512M";
-
-                # EFI system partition
-                type = "EF00";
-
                 content = {
-                  # This partition contains a filesystem
-                  type = "filesystem";
-
                   # Format the partition as FAT
                   format = "vfat";
 
                   # Mount the partition at /boot
                   mountpoint = "/boot";
+
+                  # This partition contains a filesystem
+                  type = "filesystem";
                 };
+
+                # Size of the boot partition
+                size = "1G";
+
+                # EFI system partition
+                type = "EF00";
               };
 
               main = {
-                # Use the rest of the disk for the main partition
-                size = "100%";
-
                 content = {
-                  # This partition contains a filesystem
-                  type = "filesystem";
-
                   # Format the partition as ext4
                   format = "ext4";
 
                   # Mount the partition at /
                   mountpoint = "/";
+
+                  # This partition contains a filesystem
+                  type = "filesystem";
                 };
+
+                # Use the rest of the disk for the main partition
+                size = "100%";
+
+                # Linux filesystem partition
+                type = "8300";
               };
             };
+
+            # Use GPT partition table
+            type = "gpt";
           };
+
+          device = config.constants.storage.disks.main.device;
+          type = "disk";
         };
       };
     };

src/{% if docs %}docs{% endif %}/docs/02-Installation.md.jinja

@@ -23,29 +23,15 @@ private keys on the target machine either in `~/.config/sops/age/keys.txt`
 or somewhere else with `SOPS_AGE_KEY_FILE` environment variable set.
 The installation script will copy the keys to persistent storage.
 
-Pick the host configuration you want to install
-and the devices for disks referenced in the configuration.
-For example, if you want to install the `dummy` host configuration
-and you have a single disk `/dev/sda`, run:
+Change the HOST variable to the name of the host configuration
+you want to install and run:
 
 <!-- markdownlint-disable line-length -->
 
 ```sh
-sudo nix --experimental-features 'nix-command flakes' run github:{{ accountname }}/{{ reponame }}#dummy-install-script -- --main /dev/sda
+sudo nix --experimental-features 'nix-command flakes' run "github:{{ accountname }}/{{ reponame }}#${HOST}-install-script"
 ```
 
 <!-- markdownlint-enable line-length -->
 
 and then reboot the machine.
-
-Installation scripts are customized for each host configuration.
-If you want more information about available options, use the `--help` flag.
-For example for the `dummy` host configuration:
-
-<!-- markdownlint-disable line-length -->
-
-```sh
-sudo nix --experimental-features 'nix-command flakes' run github:{{ accountname }}/{{ reponame }}#dummy-install-script -- --help
-```
-
-<!-- markdownlint-enable line-length -->