Refactor

configuration.nix

@@ -1,25 +1,22 @@
 {
-  modulesPath,
+  inputs,
-  inputs',
+  pkgs,
   lib,
   ...
 }:
 {
-  imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix" ];
-
   nix.settings.experimental-features = [ "pipe-operators" ];
 
   networking.hostName = "installer";
 
-  formatAttr = "isoImage";
-  fileExtension = ".iso";
-
-  services.openssh.enable = lib.mkForce false;
-  networking.wireless.enable = false;
-
   console.keyMap = "de-latin1-nodeadkeys";
 
-  environment.systemPackages = [ inputs'.disko.packages.default ];
+  services.openssh.enable = lib.mkForce false;
+
+  networking.wireless.enable = false;
+  networking.networkmanager.enable = true;
+
+  environment.systemPackages = [ inputs.disko.packages.${pkgs.system}.default ];
 
   services.tailscale = {
     enable = true;
@@ -27,6 +24,6 @@
     extraUpFlags = [ "--ssh" ];
 
     # Ephemeral + not pre-approved
-    authKeyFile = ../tailscale-auth-key.dec;
+    authKeyFile = ./tailscale-auth-key.dec;
   };
 }

flake.nix

@@ -25,10 +25,34 @@
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [ "x86_64-linux" ];
 
-      imports = [
+      perSystem =
-        ./flake/dev-shells.nix
+        { system, pkgs, ... }:
-        ./flake/formatter.nix
+        {
-        ./flake/image-generators.nix
+          packages = {
-      ];
+            iso = inputs.nixos-generators.nixosGenerate {
+              format = "install-iso";
+              inherit system;
+              specialArgs = { inherit inputs; };
+              modules = [ ./configuration.nix ];
+            };
+          };
+
+          devShells.default = pkgs.mkShell {
+            packages = [
+              pkgs.sops
+              pkgs.age
+            ];
+          };
+
+          formatter =
+            (inputs.treefmt-nix.lib.evalModule pkgs {
+              projectRootFile = "flake.nix";
+              programs = {
+                nixfmt.enable = true;
+                prettier.enable = true;
+                just.enable = true;
+              };
+            }).config.build.wrapper;
+        };
     };
 }

flake/dev-shells.nix

@@ -1,12 +0,0 @@
-{
-  perSystem =
-    { pkgs, ... }:
-    {
-      devShells.default = pkgs.mkShell {
-        packages = [
-          pkgs.sops
-          pkgs.age
-        ];
-      };
-    };
-}

flake/formatter.nix

@@ -1,16 +0,0 @@
-{ inputs, ... }:
-{
-  perSystem =
-    { pkgs, ... }:
-    {
-      formatter =
-        (inputs.treefmt-nix.lib.evalModule pkgs {
-          projectRootFile = "flake.nix";
-          programs = {
-            nixfmt.enable = true;
-            prettier.enable = true;
-            just.enable = true;
-          };
-        }).config.build.wrapper;
-    };
-}

flake/image-generators.nix

@@ -1,48 +0,0 @@
-{ inputs, self, ... }:
-{
-  perSystem =
-    {
-      system,
-      inputs',
-      lib,
-      ...
-    }:
-    {
-      packages =
-        let
-          mkImage =
-            {
-              name,
-              format,
-              config ? { },
-            }:
-            {
-              ${name} = inputs.nixos-generators.nixosGenerate {
-                customFormats.minimal-iso = "${self}/formats/minimal-iso.nix";
-                inherit system format;
-                specialArgs = { inherit inputs'; };
-                modules = [
-                  { isoImage.isoBaseName = name; }
-                  config
-                ];
-              };
-            };
-        in
-        lib.mkMerge [
-
-          (mkImage {
-            name = "minimal";
-            format = "minimal-iso";
-          })
-
-          (mkImage {
-            name = "minimal-wlan";
-            format = "minimal-iso";
-            config = {
-              networking.networkmanager.enable = true;
-            };
-          })
-
-        ];
-    };
-}