teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

iso-cd: style cleanup (#2)

Browse source
This commit is contained in:
Timothy DeHerrera 2021-02-01 18:57:19 -07:00 committed by GitHub
parent 8cb82a307f
commit 17621d6b14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -60,10 +60,7 @@
overlay = import ./pkgs;
lib = import ./lib {
inherit (nixos) lib;
inherit nixos;
};
lib = import ./lib { inherit nixos; };
templates.flk.path = ./.;

63
lib/default.nix
View file

@ -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 // {
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;
};
}
];
}
);
nixosSystem (args // {
modules =
let
modpath = "nixos/modules";
cd = "installer/cd-dvd/installation-cd-minimal-new-kernel.nix";
isoConfig = (nixosSystem
(args // {
modules = modules ++ [
"${nixos}/${modpath}/${cd}"
({ config, ... }: {
isoImage.isoBaseName = "nixos-" + config.networking.hostName;
# 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;
in
modules ++ [{
system.build = {
iso = isoConfig.system.build.isoImage;
};
}];
});
nixosModules =
let