From 9d04ce7c993733bec5a0de82e38dcd5d6883625b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?=
 <nicolas.jeannerod@moduscreate.com>
Date: Thu, 7 Nov 2024 18:36:43 +0100
Subject: [PATCH] Slight rework of the installer

---
 services/installer.nix | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/services/installer.nix b/services/installer.nix
index 6859cdb..96e54d0 100644
--- a/services/installer.nix
+++ b/services/installer.nix
@@ -3,29 +3,30 @@
 
   WARNING: Running this installer will format the target disk!
 */
-nixpkgs: machine:
-  let
-    installer = { config, pkgs, lib, ... }:
-      let
-        bootstrap = pkgs.writeShellApplication {
-          name = "bootstrap";
-          runtimeInputs = with pkgs; [ nixos-install-tools ];
-          text = ''
-            ${machine.config.system.build.diskoScript}
-            nixos-install --no-root-password --no-channel-copy --system ${machine.config.system.build.toplevel} \
-              && poweroff
-          '';
-        };
-      in
+
+{ nixpkgs, ... }:
+machine:
+
+let
+  installer = { config, pkgs, lib, ... }:
+    let
+      bootstrap = pkgs.writeShellApplication {
+        name = "bootstrap";
+        runtimeInputs = with pkgs; [ nixos-install-tools ];
+        text = ''
+          ${machine.config.system.build.diskoScript}
+          nixos-install --no-root-password --no-channel-copy --system ${machine.config.system.build.toplevel} \
+            && poweroff
+        '';
+      };
+    in
       {
         imports = [
           "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
         ];
         nixpkgs.hostPlatform = "x86_64-linux";
         services.getty.autologinUser = lib.mkForce "root";
-        programs.bash.loginShellInit = ''
-          ${nixpkgs.lib.getExe bootstrap}
-        '';
+        programs.bash.loginShellInit = nixpkgs.lib.getExe bootstrap;
 
         isoImage = {
           compressImage = false;
@@ -35,6 +36,5 @@ nixpkgs: machine:
           ## use `isoImage.isoName` in the tests.
         };
       };
-  in
-  (nixpkgs.lib.nixosSystem { modules =  [installer];}).config.system.build.isoImage
- 
+in
+(nixpkgs.lib.nixosSystem { modules = [installer]; }).config.system.build.isoImage