Merge pull request 'template: use disko module direcly' (#1298) from hsjobeki-main into main

docs/site/getting-started/configure.md

@@ -89,6 +89,10 @@ Adding or configuring a new machine requires two simple steps:
           # ...
           machines = {
             "jon" = {
+              imports = [
+                # ...
+                ./modules/disko.nix
+              ];
               # ...
 
               # Change this to the correct ip-address or hostname
@@ -96,7 +100,7 @@ Adding or configuring a new machine requires two simple steps:
               clan.networking.targetHost = pkgs.lib.mkDefault "root@<hostname>"
               
               # Change this to the ID-LINK of the desired disk shown by 'lsblk'
-              clan.diskLayouts.singleDiskExt4 = {
+              disko.devices.disk.main = {
                 device = "/dev/disk/by-id/__CHANGE_ME__";
               }
 
@@ -115,6 +119,10 @@ Adding or configuring a new machine requires two simple steps:
           # ...
           machines = {
             "jon" = {
+              imports = [
+                # ...
+                ./modules/disko.nix
+              ];
               # ...
 
               # Change this to the correct ip-address or hostname
@@ -122,7 +130,7 @@ Adding or configuring a new machine requires two simple steps:
               clan.networking.targetHost = pkgs.lib.mkDefault "root@<hostname>"
               
               # Change this to the ID-LINK of the desired disk shown by 'lsblk'
-              clan.diskLayouts.singleDiskExt4 = {
+              disko.devices.disk.main = {
                 device = "/dev/disk/by-id/__CHANGE_ME__";
               }
 

docs/site/getting-started/flake-parts.md

@@ -69,6 +69,7 @@ Below is a guide on how to structure this in your flake.nix:
           jon = {
             imports = [
               ./machines/jon/configuration.nix
+              ./modules/disko.nix
               # ... more modules
             ];
             nixpkgs.hostPlatform = "x86_64-linux";
@@ -78,7 +79,7 @@ Below is a guide on how to structure this in your flake.nix:
             clan.networking.targetHost = pkgs.lib.mkDefault "root@jon";
 
             # remote> lsblk --output NAME,ID-LINK,FSTYPE,SIZE,MOUNTPOINT
-            clan.diskLayouts.singleDiskExt4 = {
+            disko.devices.disk.main = {
               device = "/dev/disk/by-id/nvme-eui.e8238fa6bf530001001b448b4aec2929";
             };
 

templates/new-clan/flake.nix

@@ -45,6 +45,7 @@
           sara = {
             imports = [
               ./modules/shared.nix
+              ./modules/disko.nix
               ./machines/sara/configuration.nix
             ];
 
@@ -58,7 +59,7 @@
             # local> clan facts generate
 
             # remote> lsblk --output NAME,PTUUID,FSTYPE,SIZE,MOUNTPOINT
-            clan.diskLayouts.singleDiskExt4 = {
+            disko.devices.disk.main = {
               device = "/dev/disk/by-id/__CHANGE_ME__";
             };
 

templates/new-clan/modules/disko.nix

@@ -0,0 +1,37 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        # Set the following in flake.nix for each maschine:
+        # device = <uuid>;
+        content = {
+          type = "gpt";
+          partitions = {
+            boot = {
+              size = "1M";
+              type = "EF02"; # for grub MBR
+            };
+            ESP = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            root = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+                mountpoint = "/";
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}