cleanup files and add AIO image

aeolia-config.nix

@@ -1,11 +0,0 @@
-{ pkgs, modulesPath, fetchzip, ... }: {
-  imports = [
-    (modulesPath + "/profiles/minimal.nix")
-    ./base.nix
-  ];
-
-  # boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (pkgs.callPackage ./kernel-aeolia.nix {}));
-  boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (pkgs.callPackage ./kernel-aeolia-5.3.nix {}));
-
-  system.stateVersion = "25.05";
-}

base.nix

@@ -1,90 +0,0 @@
-{ config, pkgs, lib, modulesPath, ... }: {
-  fileSystems = {
-    "/boot" = {
-      device = "/dev/disk/by-label/nixos-boot";
-      fsType = "vfat";
-      options = [ "nofail" "noauto" ];
-    };
-    "/" = {
-      device = "/dev/disk/by-label/nixos-root";
-      fsType = "ext4";
-    };
-  };
-
-  boot.loader.grub.enable = false;
-
-  system.build.rootFileSystem = pkgs.callPackage (modulesPath + "/../lib/make-ext4-fs.nix") {
-    storePaths = with pkgs; [
-      config.system.build.toplevel
-    ];
-    volumeLabel = "nixos-root";
-    populateImageCommands = ''
-      cp ${config.system.build.toplevel}/init ./files/init
-      touch ./files/firstboot
-    '';
-  };
-
-  # from https://github.com/NixOS/nixpkgs/blob/e405f30513169feedb64b5c25e7b00242010af58/nixos/modules/installer/sd-card/sd-image.nix#L267
-  boot.postBootCommands = let
-      expandOnBoot = ''
-        # Figure out device names for the boot device and root filesystem.
-        rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /)
-        bootDevice=$(lsblk -npo PKNAME $rootPart)
-        partNum=$(lsblk -npo MAJ:MIN $rootPart | ${pkgs.gawk}/bin/awk -F: '{print $2}')
-
-        # Resize the root partition and the filesystem to fit the disk
-        echo ",+," | sfdisk -N$partNum --no-reread $bootDevice
-        ${pkgs.parted}/bin/partprobe
-        ${pkgs.e2fsprogs}/bin/resize2fs $rootPart
-      '';
-      firstbootFile = "/firstboot";
-    in ''
-      # On the first boot do some maintenance tasks
-      if [ -f ${firstbootFile} ]; then
-        set -euo pipefail
-        set -x
-
-        ${expandOnBoot}
-
-        # TODO what does all this do?
-
-        # Register the contents of the initial Nix store
-        # ${config.nix.package.out}/bin/nix-store --load-db < ${firstbootFile}
-
-        # nixos-rebuild also requires a "system" profile and an /etc/NIXOS tag.
-        # touch /etc/NIXOS
-        # ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
-
-        # Prevents this from running on later boots.
-        rm -f ${firstbootFile}
-      fi
-    '';
-
-  # system.build.usbImage = pkgs.callPackage ({ stdenvNoCC }: stdenvNoCC.mkDerivation {
-  #   name = "nixos-ps4-usbimage";
-
-  #   nativeBuildInputs = with pkgs; [ mtools ];
-
-  #   buildCommand = ''
-  #     mkdir $out
-  #     dd if=/dev/zero of=$out/nixos.img bs=1M count=2
-  #     mformat -F -i $out/nixos.img ::
-  #     mcopy -i $out/nixos.img ${config.system.build.system.kernel}/bzImage
-  #   '';
-  # }) {};
-
-  boot.initrd.preFailCommands = ''
-    export allowShell=1
-  '';
-
-  users.users.nixos = {
-    isNormalUser = true;
-    password = "nixos";
-    extraGroups = [ "wheel" ];
-  };
-
-  users.defaultUserShell = pkgs.fish;
-  programs.fish.enable = true;
-
-  services.getty.autologinUser = "nixos";
-}

flake.nix

@@ -19,8 +19,8 @@
                 super.makeModulesClosure (x // { allowMissing = true; });
             })
           ]; })
-          ./aeolia-config.nix
+          ./nixos
-          ./config.nix
+          ./installer.nix
         ];
       };
     };
@@ -28,17 +28,23 @@
     usb.aeolia = nixpkgs.legacyPackages.x86_64-linux.stdenvNoCC.mkDerivation {
       name = "nixos-ps4-usb-aeolia";
 
-      kernel = self.nixosConfigurations.aeolia.config.system.build.kernel;
+      # kernel = self.nixosConfigurations.aeolia.config.system.build.kernel;
-      initrd = self.nixosConfigurations.aeolia.config.system.build.initialRamdisk;
+      # initrd = self.nixosConfigurations.aeolia.config.system.build.initialRamdisk;
-      rootfs = self.nixosConfigurations.aeolia.config.system.build.rootFileSystem;
+      # rootfs = self.nixosConfigurations.aeolia.config.system.build.rootFileSystem;
 
-      dontUnpack = true;
+      img = self.nixosConfigurations.aeolia.config.system.build.usbImage;
-      installPhase = ''
+
-        mkdir -p $out/boot $out/root
+      buildCommand = ''
-        cp $kernel/bzImage $out/boot/bzImage
+        cp $img $out
-        cp $initrd/initrd.gz $out/boot/initramfs.cpio.gz
-        cp $rootfs $out/root/rootfs.img
       '';
+
+      # dontUnpack = true;
+      # installPhase = ''
+      #   mkdir -p $out/boot $out/root
+      #   cp $kernel/bzImage $out/boot/bzImage
+      #   cp $initrd/initrd.gz $out/boot/initramfs.cpio.gz
+      #   cp $rootfs $out/root/rootfs.img
+      # '';
     };
   };
 }

installer.nix

@@ -0,0 +1,18 @@
+{ pkgs, modulesPath, ... }: {
+  imports = [ (modulesPath + "/profiles/minimal.nix") ];
+
+  ps4.enable = true;
+
+  users.users.nixos = {
+    isNormalUser = true;
+    password = "nixos";
+    extraGroups = [ "wheel" ];
+  };
+
+  services.getty.autologinUser = "nixos";
+
+  users.defaultUserShell = pkgs.fish;
+  programs.fish.enable = true;
+
+  system.stateVersion = "25.05";
+}

nixos/default.nix

@@ -21,9 +21,10 @@
         description = "Compress the resulting image with zstd.";
       };
 
+      # TODO this is unnecessary. just make the partition big enough to fit the boot files automatically.
       bootPartitionSize = mkOption {
         type = types.int;
-        default = 128;
+        default = 64;
         description = "Size of the boot partition, in mebibytes (1024x1024 bytes).";
       };
 
@@ -57,6 +58,9 @@
   };
 
   config = let cfg = config.ps4; in lib.mkIf cfg.enable {
+    # TODO write definitions for the other southbridges
+    boot.kernelPackages = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor (pkgs.callPackage ../kernel/kernel-aeolia-5.3.nix {}));
+  
     fileSystems = {
       "/boot" = {
         device = "/dev/disk/by-label/${cfg.usbImage.bootPartitionLabel}";
@@ -70,6 +74,7 @@
     };
 
     boot.loader.grub.enable = lib.mkForce false;
+    boot.loader.initScript.enable = lib.mkForce true;
 
     # from https://github.com/NixOS/nixpkgs/blob/e405f30513169feedb64b5c25e7b00242010af58/nixos/modules/installer/sd-card/sd-image.nix#L267
     boot.postBootCommands = let
@@ -107,7 +112,7 @@
       fi
     '';
     
-    system.build.rootFileSystem = pkgs.callPackage (modulesPath + "/../lib/make-ext4-fs.nix") {
+    system.build.rootfsImage = pkgs.callPackage (modulesPath + "/../lib/make-ext4-fs.nix") {
       storePaths = [ config.system.build.toplevel ];
       volumeLabel = cfg.usbImage.rootPartitionLabel;
       populateImageCommands = ''
@@ -115,5 +120,53 @@
         touch ./files/firstboot
       '';
     };
+
+    # slightly modified version of https://github.com/NixOS/nixpkgs/blob/e405f30513169feedb64b5c25e7b00242010af58/nixos/modules/installer/sd-card/sd-image.nix#L182
+    system.build.usbImage = pkgs.stdenv.mkDerivation {
+      name = cfg.usbImage.imageName;
+
+      nativeBuildInputs = with pkgs; [ dosfstools parted mtools e2fsprogs util-linux ]
+        ++ lib.optional cfg.usbImage.compressImage zstd;
+
+      inherit (cfg.usbImage) compressImage;
+
+      buildCommand = ''
+        # mkdir -p $out/usb-image
+        img=$out
+        rootfs=${config.system.build.rootfsImage}
+
+        # Create the image to fit rootfs + bootfs + 1 MiB
+        rootfsSizeBlocks=$(du -B 512 --apparent-size $rootfs | awk '{ print $1 }')
+        bootfsSizeBlocks=$((${toString cfg.usbImage.bootPartitionSize} * 1024 * 1024 / 512))
+        imageSize=$((rootfsSizeBlocks * 512 + bootfsSizeBlocks * 512 + 1 * 1024 * 1024))
+        truncate -s $imageSize $img
+
+        # Partition the image
+        parted -s $img -- mklabel msdos
+        parted -s $img -- mkpart primary fat32 1M ${toString (cfg.usbImage.bootPartitionSize + 1)}M
+        parted -s $img -- mkpart primary ext4 ${toString (cfg.usbImage.bootPartitionSize + 1)}M 100%
+
+        # Copy the rootfs to the image
+        eval $(partx $img -o START,SECTORS --nr 2 --pairs)
+        dd conv=notrunc if=$rootfs of=$img seek=$START count=$SECTORS
+
+        # Create a temporary image for the boot partition
+        eval $(partx $img -o START,SECTORS --nr 1 --pairs)
+        truncate -s $((SECTORS * 512)) boot.img
+        mkfs.vfat -F 32 -n ${cfg.usbImage.bootPartitionLabel} boot.img
+
+        # Copy the files that the PS4 Linux Loader payload expects to the boot partition
+        mcopy -i boot.img ${config.system.build.kernel}/bzImage ::/bzImage
+        mcopy -i boot.img ${config.system.build.initialRamdisk}/initrd.gz ::/initramfs.cpio.gz
+
+        # Verify the boot partition before copying it
+        fsck.vfat -vn boot.img
+        dd conv=notrunc if=boot.img of=$img seek=$START count=$SECTORS
+
+        if test -n "$compressImage"; then
+          zstd -T$NIX_BUILD_CORES --rm $img
+        fi
+      '';
+    };
   };
 }