starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-07-10 14:42:40 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

chore: replace nixos-generators image outputs

Browse Source
This commit is contained in:
Ryan Yin
2026-06-14 14:10:08 +08:00
parent 2ed03e23e3
commit 400725b36c
20 changed files with 18 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
-37
View File
@@ -626,21 +626,6 @@
"type": "github" "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": { "nixos-apple-silicon": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@@ -662,27 +647,6 @@
"type": "github" "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": { "nixpak": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
@@ -966,7 +930,6 @@
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixos-apple-silicon": "nixos-apple-silicon", "nixos-apple-silicon": "nixos-apple-silicon",
"nixos-generators": "nixos-generators",
"nixpak": "nixpak", "nixpak": "nixpak",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-2505": "nixpkgs-2505", "nixpkgs-2505": "nixpkgs-2505",
flake.nix
-5
View File
@@ -87,11 +87,6 @@
url = "github:nix-community/preservation"; 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 # secrets management
agenix = { agenix = {
# lock with git commit at May 18, 2025 # lock with git commit at May 18, 2025
lib/nixosSystem.nix
+1 -4
View File
@@ -10,15 +10,12 @@
... ...
}: }:
let let
inherit (inputs) nixpkgs home-manager nixos-generators; inherit (inputs) nixpkgs home-manager;
in in
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
inherit system specialArgs; inherit system specialArgs;
modules = modules =
nixos-modules nixos-modules
++ [
nixos-generators.nixosModules.all-formats
]
++ (lib.optionals ((lib.lists.length home-modules) > 0) [ ++ (lib.optionals ((lib.lists.length home-modules) > 0) [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
outputs/aarch64-linux/src/12kingdoms-shoukei.nix
+1 -1
View File
@@ -56,6 +56,6 @@ in
# generate iso image for hosts with desktop environment # generate iso image for hosts with desktop environment
packages = { packages = {
"${name}-niri" = inputs.self.nixosConfigurations."${name}-niri".config.formats.iso; "${name}-niri" = inputs.self.nixosConfigurations."${name}-niri".config.system.build.images.iso;
}; };
} }
outputs/x86_64-linux/src/idols-ai.nix
+1 -1
View File
@@ -56,6 +56,6 @@ in
# generate iso image for hosts with desktop environment # generate iso image for hosts with desktop environment
packages = { packages = {
"${name}-niri" = inputs.self.nixosConfigurations."${name}-niri".config.formats.iso; "${name}-niri" = inputs.self.nixosConfigurations."${name}-niri".config.system.build.images.iso;
}; };
} }
outputs/x86_64-linux/src/idols-aquamarine.nix
+1 -1
View File
@@ -47,5 +47,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/idols-kana.nix
+1 -1
View File
@@ -44,5 +44,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/idols-ruby.nix
+1 -1
View File
@@ -44,7 +44,7 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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 # nixos tests
packages."${name}-nixos-tests" = import ../nixos-tests/idols-ruby.nix systemArgs; packages."${name}-nixos-tests" = import ../nixos-tests/idols-ruby.nix systemArgs;
outputs/x86_64-linux/src/k3s-prod-1-master-1.nix
+1 -1
View File
@@ -40,5 +40,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/k3s-prod-1-master-2.nix
+1 -1
View File
@@ -37,5 +37,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/k3s-prod-1-master-3.nix
+1 -1
View File
@@ -37,5 +37,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/k3s-prod-1-worker-1.nix
+1 -1
View File
@@ -37,5 +37,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/k3s-prod-1-worker-2.nix
+1 -1
View File
@@ -37,5 +37,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/k3s-prod-1-worker-3.nix
+1 -1
View File
@@ -37,5 +37,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/k3s-test-1-master-1.nix
+1 -1
View File
@@ -40,5 +40,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/k3s-test-1-master-2.nix
+1 -1
View File
@@ -37,5 +37,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/k3s-test-1-master-3.nix
+1 -1
View File
@@ -37,5 +37,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/kubevirt-shoryu.nix
+1 -1
View File
@@ -45,5 +45,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/kubevirt-shushou.nix
+1 -1
View File
@@ -42,5 +42,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }
outputs/x86_64-linux/src/kubevirt-youko.nix
+1 -1
View File
@@ -42,5 +42,5 @@ in
colmena.${name} = mylib.colmenaSystem (systemArgs // { inherit tags ssh-user; }); 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;
} }