From 83346eeff50907c32a6746aa515b2e6c76fc40fd Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Sun, 7 Apr 2024 15:59:33 +0200
Subject: [PATCH] template: Fixed incorrect nix code

---
 templates/new-clan/flake.nix | 44 +++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/templates/new-clan/flake.nix b/templates/new-clan/flake.nix
index 04ded52b..542f957d 100644
--- a/templates/new-clan/flake.nix
+++ b/templates/new-clan/flake.nix
@@ -9,46 +9,58 @@
       system = "x86_64-linux";
       pkgs = clan-core.inputs.nixpkgs.legacyPackages.${system};
       clan = clan-core.lib.buildClan {
-        specialArgs = { }; # Add arguments to every nix import in here
         directory = self;
         clanName = "__CHANGE_ME__"; # Ensure this is internet wide unique.
+        clanIcon = null; # Optional, a path to an image file
+        # TODO: boot into the installer
+        # remote> nixos-generate-config --root /tmp/config --no-filesystems
+        # local> mkdir -p ./machines/machine1
+        # local> scp -r root@machine1:/tmp/config ./machines/machine1
+        # local> Edit ./machines/machine1/configuration.nix to your liking
         machines = {
           jon = {
             nixpkgs.hostPlatform = system;
             imports = [
-              # TODO: boot into the installer
-              # remote> nixos-generate-config --root /tmp/config --no-filesystems
-              # local> mkdir -p ./machines/machine1
-              # local> scp -r root@machine1:/tmp/config ./machines/machine1
-              # local> Edit ./machines/machine1/configuration.nix to your liking
-              ./modules/disko.nix
               ./machines/jon/configuration.nix
               clan-core.clanModules.sshd
+              clan-core.clanModules.diskLayouts
               {
+                config.clanCore.machineIcon = null; # Optional, a path to an image file
+
                 # Set this for clan commands use ssh i.e. `clan machines update`
-                clan.networking.targetHost = pkgs.lib.mkDefault "root@<IP_ADDRESS>";
+                config.clan.networking.targetHost = pkgs.lib.mkDefault "root@<IP_ADDRESS>";
+
+                # TODO: Example how to use disko for more complicated setups
+
                 # remote> lsblk --output NAME,PTUUID,FSTYPE,SIZE,MOUNTPOINT
+                config.clan.diskLayouts.singleDiskExt4 = {
+                  device = "/dev/disk/by-id/__CHANGE_ME__";
+                };
 
-                config.disko.devices.disk.main.device = "/dev/disk/by-id/__CHANGE_ME__";
+                config.services.getty.autologinUser = "root";
 
-                clan.networking.zerotier.controller.enable = true;
+                # TODO: Document that there needs to be one controller
+                config.clan.networking.zerotier.controller.enable = true;
               }
             ];
           };
           sara = {
             nixpkgs.hostPlatform = system;
             imports = [
-              # ./machines/machine2/configuration.nix
-              ./modules/disko.nix
               ./machines/sara/configuration.nix
               clan-core.clanModules.sshd
+              clan-core.clanModules.diskLayouts
               {
-                # Set this for clan commands use ssh i.e. `clan machines update`
-                clan.networking.targetHost = pkgs.lib.mkDefault "root@<IP_ADDRESS>";
+                config.clanCore.machineIcon = null; # Optional, a path to an image file
+
+                # Set this for clan commands use ssh i.e. `clan machines update`
+                config.clan.networking.targetHost = pkgs.lib.mkDefault "root@<IP_ADDRESS>";
 
-                config.disko.devices.disk.main.device = "/dev/disk/by-id/__CHANGE_ME__";
                 # local> clan facts generate
-                clan.networking.zerotier.networkId = builtins.readFile ./machines/machine1/facts/zerotier-network-id;
+
+                config.clan.diskLayouts.singleDiskExt4 = {
+                  device = "/dev/disk/by-id/__CHANGE_ME__";
+                };
               }
             ];
           };