Merge remote-tracking branch 'origin/main' into rework-installation

templates/flake-parts/flake.nix

@@ -17,7 +17,6 @@
       systems = [
         "x86_64-linux"
         "aarch64-linux"
-
         "x86_64-darwin"
         "aarch64-darwin"
       ];

templates/flake.nix

@@ -1,16 +1,14 @@
 {
-  outputs =
-    { ... }:
-    {
-      templates = {
-        default = {
-          description = "Initialize a new clan flake";
-          path = ./new-clan;
-        };
-        minimal = {
-          description = "for clans managed via (G)UI";
-          path = ./minimal;
-        };
+  outputs = { ... }: {
+    templates = {
+      default = {
+        description = "Initialize a new clan flake";
+        path = ./new-clan;
+      };
+      minimal = {
+        description = "for clans managed via (G)UI";
+        path = ./minimal;
       };
     };
+  };
 }

templates/minimal/inventory.json

@@ -0,0 +1,5 @@
+{
+  "meta": { "name": "__CHANGE_ME__" },
+  "machines": {},
+  "services": {}
+}

templates/new-clan/machines/jon/configuration.nix

@@ -24,9 +24,11 @@
 
   # IMPORTANT! Add your SSH key here
   # e.g. > cat ~/.ssh/id_ed25519.pub
-  users.users.root.openssh.authorizedKeys.keys = [''
-    __YOUR_SSH_KEY__
-  ''];
+  users.users.root.openssh.authorizedKeys.keys = [
+    ''
+      __YOUR_SSH_KEY__
+    ''
+  ];
 
   # Zerotier needs one controller to accept new nodes. Once accepted
   # the controller can be offline and routing still works.

templates/new-clan/machines/sara/configuration.nix

@@ -21,9 +21,11 @@
 
   # IMPORTANT! Add your SSH key here
   # e.g. > cat ~/.ssh/id_ed25519.pub
-  users.users.root.openssh.authorizedKeys.keys = [''
-    __YOUR_SSH_KEY__
-  ''];
+  users.users.root.openssh.authorizedKeys.keys = [
+    ''
+      __YOUR_SSH_KEY__
+    ''
+  ];
   /*
     After jon is deployed, uncomment the following line
     This will allow sara to share the VPN overlay network with jon