From 400725b36c57960d7724ee0db92aa4a877c4adcc Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 14 Jun 2026 14:10:08 +0800
Subject: [PATCH] chore: replace nixos-generators image outputs

---
 flake.lock                                    | 37 -------------------
 flake.nix                                     |  5 ---
 lib/nixosSystem.nix                           |  5 +--
 .../aarch64-linux/src/12kingdoms-shoukei.nix  |  2 +-
 outputs/x86_64-linux/src/idols-ai.nix         |  2 +-
 outputs/x86_64-linux/src/idols-aquamarine.nix |  2 +-
 outputs/x86_64-linux/src/idols-kana.nix       |  2 +-
 outputs/x86_64-linux/src/idols-ruby.nix       |  2 +-
 .../x86_64-linux/src/k3s-prod-1-master-1.nix  |  2 +-
 .../x86_64-linux/src/k3s-prod-1-master-2.nix  |  2 +-
 .../x86_64-linux/src/k3s-prod-1-master-3.nix  |  2 +-
 .../x86_64-linux/src/k3s-prod-1-worker-1.nix  |  2 +-
 .../x86_64-linux/src/k3s-prod-1-worker-2.nix  |  2 +-
 .../x86_64-linux/src/k3s-prod-1-worker-3.nix  |  2 +-
 .../x86_64-linux/src/k3s-test-1-master-1.nix  |  2 +-
 .../x86_64-linux/src/k3s-test-1-master-2.nix  |  2 +-
 .../x86_64-linux/src/k3s-test-1-master-3.nix  |  2 +-
 outputs/x86_64-linux/src/kubevirt-shoryu.nix  |  2 +-
 outputs/x86_64-linux/src/kubevirt-shushou.nix |  2 +-
 outputs/x86_64-linux/src/kubevirt-youko.nix   |  2 +-
 20 files changed, 18 insertions(+), 63 deletions(-)

diff --git a/flake.lock b/flake.lock
index 05057ec6..00fff2d5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -626,21 +626,6 @@
         "type": "github"
       }
     },
-    "nixlib": {
-      "locked": {
-        "lastModified": 1736643958,
-        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
     "nixos-apple-silicon": {
       "inputs": {
         "flake-compat": "flake-compat_3",
@@ -662,27 +647,6 @@
         "type": "github"
       }
     },
-    "nixos-generators": {
-      "inputs": {
-        "nixlib": "nixlib",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769813415,
-        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "type": "github"
-      }
-    },
     "nixpak": {
       "inputs": {
         "flake-parts": "flake-parts_3",
@@ -966,7 +930,6 @@
         "nix-darwin": "nix-darwin",
         "nix-gaming": "nix-gaming",
         "nixos-apple-silicon": "nixos-apple-silicon",
-        "nixos-generators": "nixos-generators",
         "nixpak": "nixpak",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-2505": "nixpkgs-2505",
diff --git a/flake.nix b/flake.nix
index 79efd6e5..a5b6defa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,11 +87,6 @@
       url = "github:nix-community/preservation";
     };
 
-    # generate iso/qcow2/docker/... image from nixos configuration
-    nixos-generators = {
-      url = "github:nix-community/nixos-generators";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     # secrets management
     agenix = {
       # lock with git commit at May 18, 2025
diff --git a/lib/nixosSystem.nix b/lib/nixosSystem.nix
index b7390248..9f33c7db 100644
--- a/lib/nixosSystem.nix
+++ b/lib/nixosSystem.nix
@@ -10,15 +10,12 @@
   ...
 }:
 let
-  inherit (inputs) nixpkgs home-manager nixos-generators;
+  inherit (inputs) nixpkgs home-manager;
 in
 nixpkgs.lib.nixosSystem {
   inherit system specialArgs;
   modules =
     nixos-modules
-    ++ [
-      nixos-generators.nixosModules.all-formats
-    ]
     ++ (lib.optionals ((lib.lists.length home-modules) > 0) [
       home-manager.nixosModules.home-manager
       {
diff --git a/outputs/aarch64-linux/src/12kingdoms-shoukei.nix b/outputs/aarch64-linux/src/12kingdoms-shoukei.nix
index e70c14e7..5bbe0c2c 100644
--- a/outputs/aarch64-linux/src/12kingdoms-shoukei.nix
+++ b/outputs/aarch64-linux/src/12kingdoms-shoukei.nix
@@ -56,6 +56,6 @@ in
 
   # generate iso image for hosts with desktop environment
   packages = {
-    "${name}-niri" = inputs.self.nixosConfigurations."${name}-niri".config.formats.iso;
+    "${name}-niri" = inputs.self.nixosConfigurations."${name}-niri".config.system.build.images.iso;
   };
 }
diff --git a/outputs/x86_64-linux/src/idols-ai.nix b/outputs/x86_64-linux/src/idols-ai.nix
index 350cb4cc..0ba71678 100644
--- a/outputs/x86_64-linux/src/idols-ai.nix
+++ b/outputs/x86_64-linux/src/idols-ai.nix
@@ -56,6 +56,6 @@ in
 
   # generate iso image for hosts with desktop environment
   packages = {
-    "${name}-niri" = inputs.self.nixosConfigurations."${name}-niri".config.formats.iso;
+    "${name}-niri" = inputs.self.nixosConfigurations."${name}-niri".config.system.build.images.iso;
   };
 }
diff --git a/outputs/x86_64-linux/src/idols-aquamarine.nix b/outputs/x86_64-linux/src/idols-aquamarine.nix
index 8ef92b22..7dcd1456 100644
--- a/outputs/x86_64-linux/src/idols-aquamarine.nix
+++ b/outputs/x86_64-linux/src/idols-aquamarine.nix
@@ -47,5 +47,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/idols-kana.nix b/outputs/x86_64-linux/src/idols-kana.nix
index 68f9f326..888584dc 100644
--- a/outputs/x86_64-linux/src/idols-kana.nix
+++ b/outputs/x86_64-linux/src/idols-kana.nix
@@ -44,5 +44,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/idols-ruby.nix b/outputs/x86_64-linux/src/idols-ruby.nix
index d055dafc..6cc871ae 100644
--- a/outputs/x86_64-linux/src/idols-ruby.nix
+++ b/outputs/x86_64-linux/src/idols-ruby.nix
@@ -44,7 +44,7 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 
   # nixos tests
   packages."${name}-nixos-tests" = import ../nixos-tests/idols-ruby.nix systemArgs;
diff --git a/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix b/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
index 644d4719..9fdbfceb 100644
--- a/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
+++ b/outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
@@ -40,5 +40,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/k3s-prod-1-master-2.nix b/outputs/x86_64-linux/src/k3s-prod-1-master-2.nix
index 69d4d9f4..c1766dc3 100644
--- a/outputs/x86_64-linux/src/k3s-prod-1-master-2.nix
+++ b/outputs/x86_64-linux/src/k3s-prod-1-master-2.nix
@@ -37,5 +37,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/k3s-prod-1-master-3.nix b/outputs/x86_64-linux/src/k3s-prod-1-master-3.nix
index e377eedb..847a7822 100644
--- a/outputs/x86_64-linux/src/k3s-prod-1-master-3.nix
+++ b/outputs/x86_64-linux/src/k3s-prod-1-master-3.nix
@@ -37,5 +37,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/k3s-prod-1-worker-1.nix b/outputs/x86_64-linux/src/k3s-prod-1-worker-1.nix
index ef4a587f..36e3cff5 100644
--- a/outputs/x86_64-linux/src/k3s-prod-1-worker-1.nix
+++ b/outputs/x86_64-linux/src/k3s-prod-1-worker-1.nix
@@ -37,5 +37,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/k3s-prod-1-worker-2.nix b/outputs/x86_64-linux/src/k3s-prod-1-worker-2.nix
index 8a34a087..f8eb5ae1 100644
--- a/outputs/x86_64-linux/src/k3s-prod-1-worker-2.nix
+++ b/outputs/x86_64-linux/src/k3s-prod-1-worker-2.nix
@@ -37,5 +37,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/k3s-prod-1-worker-3.nix b/outputs/x86_64-linux/src/k3s-prod-1-worker-3.nix
index a87c09bf..9d0e435a 100644
--- a/outputs/x86_64-linux/src/k3s-prod-1-worker-3.nix
+++ b/outputs/x86_64-linux/src/k3s-prod-1-worker-3.nix
@@ -37,5 +37,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/k3s-test-1-master-1.nix b/outputs/x86_64-linux/src/k3s-test-1-master-1.nix
index 330a3c75..6cc44109 100644
--- a/outputs/x86_64-linux/src/k3s-test-1-master-1.nix
+++ b/outputs/x86_64-linux/src/k3s-test-1-master-1.nix
@@ -40,5 +40,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/k3s-test-1-master-2.nix b/outputs/x86_64-linux/src/k3s-test-1-master-2.nix
index 0648fb18..c97ab9eb 100644
--- a/outputs/x86_64-linux/src/k3s-test-1-master-2.nix
+++ b/outputs/x86_64-linux/src/k3s-test-1-master-2.nix
@@ -37,5 +37,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/k3s-test-1-master-3.nix b/outputs/x86_64-linux/src/k3s-test-1-master-3.nix
index a78c159f..d8b119a0 100644
--- a/outputs/x86_64-linux/src/k3s-test-1-master-3.nix
+++ b/outputs/x86_64-linux/src/k3s-test-1-master-3.nix
@@ -37,5 +37,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.kubevirt;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.kubevirt;
 }
diff --git a/outputs/x86_64-linux/src/kubevirt-shoryu.nix b/outputs/x86_64-linux/src/kubevirt-shoryu.nix
index 749f7784..66e36225 100644
--- a/outputs/x86_64-linux/src/kubevirt-shoryu.nix
+++ b/outputs/x86_64-linux/src/kubevirt-shoryu.nix
@@ -45,5 +45,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.iso;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.iso;
 }
diff --git a/outputs/x86_64-linux/src/kubevirt-shushou.nix b/outputs/x86_64-linux/src/kubevirt-shushou.nix
index d99d377a..a211542b 100644
--- a/outputs/x86_64-linux/src/kubevirt-shushou.nix
+++ b/outputs/x86_64-linux/src/kubevirt-shushou.nix
@@ -42,5 +42,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.iso;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.iso;
 }
diff --git a/outputs/x86_64-linux/src/kubevirt-youko.nix b/outputs/x86_64-linux/src/kubevirt-youko.nix
index fb7bfe53..c7453e03 100644
--- a/outputs/x86_64-linux/src/kubevirt-youko.nix
+++ b/outputs/x86_64-linux/src/kubevirt-youko.nix
@@ -42,5 +42,5 @@ in
 
   colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; });
 
-  packages.${name} = inputs.self.nixosConfigurations.${name}.config.formats.iso;
+  packages.${name} = inputs.self.nixosConfigurations.${name}.config.system.build.images.iso;
 }