images/: adjust installer images configuration

Author: colemickens

flake.nix

@@ -124,7 +124,7 @@
             extraConfig = [ { nixpkgs.buildPlatform.system = "x86_64-linux"; } ];
           };
           installer-riscv64 = {
-            path = ./images/installer/configuration-base-riscv64.nix;
+            path = ./images/installer/configuration-riscv64.nix;
             extraConfig = [ { nixpkgs.buildPlatform.system = "x86_64-linux"; } ];
           };
         };
@@ -139,22 +139,19 @@
       extra = {
         x86_64-linux = {
           installer =
-            (mkSystem "installer-standard-x86_64" {
-              path = ./images/installer/configuration-standard.nix;
+            (mkSystem "installer-x86_64" {
+              path = ./images/installer/configuration-x86_64.nix;
             }).config.system.build.toplevel;
         };
         aarch64-linux = {
           installer =
-            (mkSystem "installer-base-aarch64" {
-              path = ./images/installer/configuration-base-aarch64.nix;
+            (mkSystem "installer-aarch64" {
+              path = ./images/installer/configuration-aarch64.nix;
             }).config.system.build.toplevel;
         };
         aarch64-darwin = { };
         riscv64-linux = {
-          installer =
-            (mkSystem "installer-base-aarch64" {
-              path = ./images/installer/configuration-base-aarch64.nix;
-            }).config.system.build.toplevel;
+          installer = nixosConfigurations.installer-riscv64.config.system.build.toplevel;
           iso-bits = nixosConfigurations.installer-riscv64.config.system.build.isoImage.inputDerivation;
         };
       };

images/installer/configuration-aarch64.nix

@@ -0,0 +1,11 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ./configuration-base.nix
+  ];
+
+  config = {
+    nixpkgs.hostPlatform.system = "aarch64-linux";
+  };
+}

images/installer/configuration-base-aarch64.nix

@@ -1,40 +1,58 @@
 {
   pkgs,
   lib,
-  inputs,
+  modulesPath,
   ...
 }:
 
 {
   imports = [
+    "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
     ../../profiles/core.nix
   ];
 
   config = {
+    networking.hostName = "installer";
 
     nixcfg.common.skipMitigations = true;
     nixcfg.common.defaultKernel = true;
 
-    system.stateVersion = "23.11";
-
-    system.nixos.label = "default";
+    system.stateVersion = "26.05";
 
     boot.swraid.enable = lib.mkForce false;
 
-    nixpkgs.hostPlatform.system = "x86_64-linux";
+    boot.loader.timeout = lib.mkOverride 10 10;
 
     documentation.enable = lib.mkOverride 10 false;
     documentation.info.enable = lib.mkOverride 10 false;
     documentation.man.enable = lib.mkOverride 10 false;
     documentation.nixos.enable = lib.mkOverride 10 false;
 
-    services.fwupd.enable = lib.mkForce false;
+    services.udisks2.enable = lib.mkForce false;
+    networking.modemmanager.enable = lib.mkForce false;
 
-    # BUG not sure if this works, at one point it was claimed it didn't...
-    # boot.initrd.systemd.enable = lib.mkForce false;
+    services.fwupd.enable = lib.mkForce false;
 
     system.disableInstallerTools = lib.mkOverride 10 false;
 
+    ## <tailscale auto-login>
     systemd.services.sshd.wantedBy = pkgs.lib.mkOverride 10 [ "multi-user.target" ];
+
+    services.tailscale = {
+      enable = true;
+      extraDaemonFlags = [ "--state=mem:" ];
+    };
+    environment.loginShellInit = ''
+      [[ "$(tty)" == "/dev/tty1" || "$(tty)" == "/dev/ttyS0" ]] && (
+        if curl --max-time 10 'https://tailscale.com'; then
+          echo "trying to connect to tailscale" &>2
+          sudo tailscale login --qr
+        else
+          echo "no internet connection, skipping tailscale qr login" &>2
+        fi
+      )
+    '';
+    services.getty.autologinUser = lib.mkForce "cole";
+    ## </tailscale auto-login>
   };
 }

images/installer/configuration-base-installer.nix

@@ -0,0 +1,23 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ./configuration-base.nix
+  ];
+
+  config = {
+    nixpkgs.hostPlatform.system = "riscv64-linux";
+
+    nixcfg.common.defaultKernel = lib.mkForce true;
+    nixcfg.common.useZfs = lib.mkForce false;
+
+    boot.supportedFilesystems = lib.mkForce [
+      "btrfs"
+      "ext4"
+      "vfat"
+      "f2fs"
+      "xfs"
+      "ntfs"
+    ];
+  };
+}

images/installer/configuration-base-riscv64.nix

@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  imports = [
+    ./configuration-base.nix
+  ];
+
+  config = {
+    nixpkgs.hostPlatform.system = "x86_64-linux";
+  };
+}

images/installer/configuration-base.nix

@@ -8,9 +8,7 @@
 let
   cfg = config.nixcfg.common;
   _kernelPackages =
-    if cfg.useZfs
-    then pkgs.linuxKernel.packages.linux_6_18
-    else pkgs.linux_latest;
+    if cfg.useZfs then pkgs.linuxKernel.packages.linux_6_18 else pkgs.linuxPackages_latest;
   _zfsPackage = pkgs.zfs_2_4;
 in
 {