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

style / organization

Browse source
This commit is contained in:
David Arnold 2021-03-18 17:42:17 -05:00 committed by "David Arnold"
parent 15cf15b3ed
commit 435847823f
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/devos/devosSystem.nix
View file

@ -6,31 +6,35 @@ lib.nixosSystem (args // {
let let
moduleList = builtins.attrValues modules; moduleList = builtins.attrValues modules;
modpath = "nixos/modules"; modpath = "nixos/modules";
cd = "installer/cd-dvd/installation-cd-minimal-new-kernel.nix";
isoConfig = (lib.nixosSystem isoConfig = (lib.nixosSystem
(args // { (args // {
modules = moduleList ++ [ modules = moduleList ++ [
"${nixos}/${modpath}/${cd}"
"${nixos}/${modpath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix"
({ config, suites, ... }: { ({ config, suites, ... }: {
# avoid unwanted systemd service startups # avoid unwanted systemd service startups
disabledModules = lib.remove modules.core suites.allProfiles; disabledModules = lib.remove modules.core suites.allProfiles;
nix.registry = lib.mapAttrs (n: v: { flake = v; }) inputs;
isoImage.isoBaseName = "nixos-" + config.networking.hostName; isoImage.isoBaseName = "nixos-" + config.networking.hostName;
isoImage.contents = [{ isoImage.contents = [{
source = self; source = self;
target = "/devos/"; target = "/devos/";
}]; }];
nix.registry = lib.mapAttrs (n: v: { flake = v; }) inputs;
isoImage.storeContents = [ isoImage.storeContents = [
self.devShell.${config.nixpkgs.system} self.devShell.${config.nixpkgs.system}
]; ];
# confilcts with networking.wireless which might be slightly # confilcts with networking.wireless which might be slightly
# more useful on a stick # more useful on a stick
networking.networkmanager.enable = lib.mkForce false; networking.networkmanager.enable = lib.mkForce false;
# confilcts with networking.wireless # confilcts with networking.wireless
networking.wireless.iwd.enable = lib.mkForce false; networking.wireless.iwd.enable = lib.mkForce false;
# Set up a link-local boostrap network # Set up a link-local boostrap network
# See also: https://github.com/NixOS/nixpkgs/issues/75515#issuecomment-571661659 # See also: https://github.com/NixOS/nixpkgs/issues/75515#issuecomment-571661659
networking.usePredictableInterfaceNames = lib.mkForce true; # so prefix matching works networking.usePredictableInterfaceNames = lib.mkForce true; # so prefix matching works