merge from main

2024-09-17 23:02:53 +02:00 · 2024-09-17 23:02:53 +02:00 · 16427e5fe3
commit 16427e5fe3
parent 1e9c413afd
4 changed files with 128 additions and 70 deletions
--- a/flake.nix
+++ b/flake.nix
@ -5,84 +5,91 @@
    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
  };

-  outputs = { self, nixpkgs }: {
-    lib = {
-      # Prepare an update package for the system.
-      mkUpdate = nixos:
-        let
-          config = nixos.config;
-          pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
-        in
-        nixos.pkgs.runCommand "update-${config.system.image.version}"
-          {
-            nativeBuildInputs = with pkgs; [ xz ];
-          } ''
-          mkdir -p $out
-          xz -1 -cz ${config.system.build.uki}/${config.system.boot.loader.ukiFile} \
-            > $out/${config.system.boot.loader.ukiFile}.xz
-          xz -1 -cz ${config.system.build.image}/${config.boot.uki.name}_${config.system.image.version}.store.raw \
-            > $out/${config.boot.uki.name}_${config.system.image.version}.img.xz
-        '';
+  outputs =
+    { self, nixpkgs }:
+    {
+      lib = {
+        # Prepare an update package for the system.
+        mkUpdate =
+          nixos:
+          let
+            config = nixos.config;
+            pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
+          in
+          nixos.pkgs.runCommand "update-${config.system.image.version}"
+            {
+              nativeBuildInputs = with pkgs; [ xz ];
+            }
+            ''
+              mkdir -p $out
+              xz -1 -cz ${config.system.build.uki}/${config.system.boot.loader.ukiFile} \
+                > $out/${config.system.boot.loader.ukiFile}.xz
+              xz -1 -cz ${config.system.build.image}/${config.boot.uki.name}_${config.system.image.version}.store.raw \
+                > $out/${config.boot.uki.name}_${config.system.image.version}.img.xz
+            '';

-      # Prepare a ready-to-boot disk image.
-      mkInstallImage = nixos:
-        let
-          config = nixos.config;
-          pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
-        in
-        nixos.pkgs.runCommand "update-${config.system.image.version}"
-          {
-            nativeBuildInputs = with pkgs; [ qemu ];
-          } ''
-          mkdir -p $out
-          qemu-img convert -f raw -O qcow2 -C ${config.system.build.image}/${config.boot.uki.name}_${config.system.image.version}.raw $out/disk.qcow2
-        '';
-    };
-
-    devShells.x86_64-linux.default =
-      let
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-      in
-      pkgs.mkShell {
-        packages = [
-          self.packages.x86_64-linux.qemu-efi
-        ];
+        # Prepare a ready-to-boot disk image.
+        mkInstallImage =
+          nixos:
+          let
+            config = nixos.config;
+            pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs;
+          in
+          nixos.pkgs.runCommand "update-${config.system.image.version}"
+            {
+              nativeBuildInputs = with pkgs; [ qemu ];
+            }
+            ''
+              mkdir -p $out
+              qemu-img convert -f raw -O qcow2 -C ${config.system.build.image}/${config.boot.uki.name}_${config.system.image.version}.raw $out/disk.qcow2
+            '';
      };

-    packages.x86_64-linux = {
-      default = self.packages.x86_64-linux.patos_image;
-
-      patos_image = self.lib.mkInstallImage self.nixosConfigurations.patos;
-      patos_update = self.lib.mkUpdate self.nixosConfigurations.patos;
-
-      # A helper script to run the disk images above.
-      qemu-efi =
+      devShells.x86_64-linux.default =
        let
          pkgs = nixpkgs.legacyPackages.x86_64-linux;
        in
-        pkgs.writeShellApplication {
-          name = "qemu-efi";
-
-          runtimeInputs = [ pkgs.qemu_kvm ];
-
-          text = ''
-            qemu-system-x86_64 \
-              -smp 2 -m 2048 -machine q35,accel=kvm \
-              -bios ${pkgs.OVMF.fd}/FV/OVMF.fd \
-              -snapshot \
-              -display none \
-              -serial stdio "$@"
-          '';
+        pkgs.mkShell {
+          packages = [
+            pkgs.just
+            self.packages.x86_64-linux.qemu-efi
+          ];
        };
-    };

-    nixosConfigurations = {
-      patos = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./base.nix
-        ];
+      packages.x86_64-linux = {
+        default = self.packages.x86_64-linux.patos_image;
+
+        patos_image = self.lib.mkInstallImage self.nixosConfigurations.patos;
+        patos_update = self.lib.mkUpdate self.nixosConfigurations.patos;
+
+        # A helper script to run the disk images above.
+        qemu-efi =
+          let
+            pkgs = nixpkgs.legacyPackages.x86_64-linux;
+          in
+          pkgs.writeShellApplication {
+            name = "qemu-efi";
+
+            runtimeInputs = [ pkgs.qemu_kvm ];
+
+            text = ''
+              qemu-system-x86_64 \
+                -smp 2 -m 2048 -machine q35,accel=kvm \
+                -bios ${pkgs.OVMF.fd}/FV/OVMF.fd \
+                -snapshot \
+                -display none \
+                -serial stdio "$@"
+            '';
+          };
+      };
+
+      nixosConfigurations = {
+        patos = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [
+            ./base.nix
+          ];
+        };
      };
    };
-  };
 }