iso-cd: style cleanup (#2)
This commit is contained in:
parent
8cb82a307f
commit
17621d6b14
@ -60,10 +60,7 @@
|
||||
|
||||
overlay = import ./pkgs;
|
||||
|
||||
lib = import ./lib {
|
||||
inherit (nixos) lib;
|
||||
inherit nixos;
|
||||
};
|
||||
lib = import ./lib { inherit nixos; };
|
||||
|
||||
templates.flk.path = ./.;
|
||||
|
||||
|
@ -1,9 +1,9 @@
|
||||
{ lib, nixos, ... }:
|
||||
{ nixos, ... }:
|
||||
let
|
||||
inherit (builtins) attrNames attrValues isAttrs readDir listToAttrs mapAttrs;
|
||||
|
||||
inherit (lib) fold filterAttrs hasSuffix mapAttrs' nameValuePair removeSuffix
|
||||
recursiveUpdate genAttrs nixosSystem;
|
||||
inherit (nixos.lib) fold filterAttrs hasSuffix mapAttrs' nameValuePair removeSuffix
|
||||
recursiveUpdate genAttrs nixosSystem mkForce;
|
||||
|
||||
# mapFilterAttrs ::
|
||||
# (name -> value -> bool )
|
||||
@ -56,37 +56,32 @@ in
|
||||
(readDir dir);
|
||||
|
||||
nixosSystemExtended = { modules, ... } @ args:
|
||||
nixosSystem (
|
||||
args // {
|
||||
nixosSystem (args // {
|
||||
modules =
|
||||
let
|
||||
isoConfig = (
|
||||
import (nixos + "/nixos/lib/eval-config.nix")
|
||||
(
|
||||
args // {
|
||||
modpath = "nixos/modules";
|
||||
cd = "installer/cd-dvd/installation-cd-minimal-new-kernel.nix";
|
||||
isoConfig = (nixosSystem
|
||||
(args // {
|
||||
modules = modules ++ [
|
||||
(nixos + "/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix")
|
||||
(
|
||||
{ config, ... }: {
|
||||
"${nixos}/${modpath}/${cd}"
|
||||
({ 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
|
||||
}
|
||||
)
|
||||
# confilcts with networking.wireless which might be slightly
|
||||
# more useful on a stick
|
||||
networking.networkmanager.enable = mkForce false;
|
||||
# confilcts with networking.wireless
|
||||
networking.wireless.iwd.enable = mkForce false;
|
||||
})
|
||||
];
|
||||
}
|
||||
)
|
||||
).config;
|
||||
})).config;
|
||||
in
|
||||
modules ++ [
|
||||
{
|
||||
modules ++ [{
|
||||
system.build = {
|
||||
iso = isoConfig.system.build.isoImage;
|
||||
};
|
||||
}
|
||||
];
|
||||
}
|
||||
);
|
||||
}];
|
||||
});
|
||||
|
||||
nixosModules =
|
||||
let
|
||||
|
Loading…
Reference in New Issue
Block a user