iso: move iso target to ./lib
This commit is contained in:
parent
33bcf093b7
commit
8cb82a307f
@ -62,6 +62,7 @@
|
||||
|
||||
lib = import ./lib {
|
||||
inherit (nixos) lib;
|
||||
inherit nixos;
|
||||
};
|
||||
|
||||
templates.flk.path = ./.;
|
||||
|
@ -9,48 +9,14 @@
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
inherit (lib.flk) recImport;
|
||||
inherit (lib.flk) recImport nixosSystemExtended;
|
||||
inherit (builtins) attrValues removeAttrs;
|
||||
|
||||
unstableModules = [ ];
|
||||
addToDisabledModules = [ ];
|
||||
|
||||
libExt = lib.extend (
|
||||
final: prev: {
|
||||
nixosSystemExtended = { modules, ... } @ args:
|
||||
lib.nixosSystem (args // {
|
||||
modules =
|
||||
let
|
||||
isoConfig = (
|
||||
import (nixos + "/nixos/lib/eval-config.nix")
|
||||
(
|
||||
args // {
|
||||
modules = modules ++ [
|
||||
(nixos + "/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix")
|
||||
({ config, ... }: {
|
||||
isoImage.isoBaseName = "nixos-" + config.networking.hostName;
|
||||
networking.networkmanager.enable = lib.mkForce false; # confilcts with networking.wireless which might be slightly more useful on a stick
|
||||
networking.wireless.iwd.enable = lib.mkForce false; # confilcts with networking.wireless
|
||||
})
|
||||
];
|
||||
}
|
||||
)
|
||||
).config;
|
||||
in
|
||||
modules ++ [
|
||||
{
|
||||
system.build = {
|
||||
iso = isoConfig.system.build.isoImage;
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
config = hostName:
|
||||
libExt.nixosSystemExtended {
|
||||
nixosSystemExtended {
|
||||
inherit system;
|
||||
|
||||
specialArgs =
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ lib, ... }:
|
||||
{ lib, nixos, ... }:
|
||||
let
|
||||
inherit (builtins) attrNames attrValues isAttrs readDir listToAttrs mapAttrs;
|
||||
|
||||
inherit (lib) fold filterAttrs hasSuffix mapAttrs' nameValuePair removeSuffix
|
||||
recursiveUpdate genAttrs;
|
||||
recursiveUpdate genAttrs nixosSystem;
|
||||
|
||||
# mapFilterAttrs ::
|
||||
# (name -> value -> bool )
|
||||
@ -55,6 +55,39 @@ in
|
||||
nameValuePair ("") (null))
|
||||
(readDir dir);
|
||||
|
||||
nixosSystemExtended = { modules, ... } @ args:
|
||||
nixosSystem (
|
||||
args // {
|
||||
modules =
|
||||
let
|
||||
isoConfig = (
|
||||
import (nixos + "/nixos/lib/eval-config.nix")
|
||||
(
|
||||
args // {
|
||||
modules = modules ++ [
|
||||
(nixos + "/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix")
|
||||
(
|
||||
{ config, ... }: {
|
||||
isoImage.isoBaseName = "nixos-" + config.networking.hostName;
|
||||
networking.networkmanager.enable = lib.mkForce false; # confilcts with networking.wireless which might be slightly more useful on a stick
|
||||
networking.wireless.iwd.enable = lib.mkForce false; # confilcts with networking.wireless
|
||||
}
|
||||
)
|
||||
];
|
||||
}
|
||||
)
|
||||
).config;
|
||||
in
|
||||
modules ++ [
|
||||
{
|
||||
system.build = {
|
||||
iso = isoConfig.system.build.isoImage;
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
);
|
||||
|
||||
nixosModules =
|
||||
let
|
||||
# binary cache
|
||||
|
Loading…
Reference in New Issue
Block a user