From 435847823fac76f0f2df067893bdc2443780244a Mon Sep 17 00:00:00 2001 From: David Arnold Date: Thu, 18 Mar 2021 17:42:17 -0500 Subject: [PATCH] style / organization --- lib/devos/devosSystem.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/devos/devosSystem.nix b/lib/devos/devosSystem.nix index 524a533d..be9de4f3 100644 --- a/lib/devos/devosSystem.nix +++ b/lib/devos/devosSystem.nix @@ -6,31 +6,35 @@ lib.nixosSystem (args // { let moduleList = builtins.attrValues modules; modpath = "nixos/modules"; - cd = "installer/cd-dvd/installation-cd-minimal-new-kernel.nix"; isoConfig = (lib.nixosSystem (args // { modules = moduleList ++ [ - "${nixos}/${modpath}/${cd}" + + "${nixos}/${modpath}/installer/cd-dvd/installation-cd-minimal-new-kernel.nix" + ({ config, suites, ... }: { # avoid unwanted systemd service startups disabledModules = lib.remove modules.core suites.allProfiles; + nix.registry = lib.mapAttrs (n: v: { flake = v; }) inputs; + isoImage.isoBaseName = "nixos-" + config.networking.hostName; isoImage.contents = [{ source = self; target = "/devos/"; }]; - nix.registry = lib.mapAttrs (n: v: { flake = v; }) inputs; isoImage.storeContents = [ self.devShell.${config.nixpkgs.system} ]; + # confilcts with networking.wireless which might be slightly # more useful on a stick networking.networkmanager.enable = lib.mkForce false; # confilcts with networking.wireless networking.wireless.iwd.enable = lib.mkForce false; + # Set up a link-local boostrap network # See also: https://github.com/NixOS/nixpkgs/issues/75515#issuecomment-571661659 networking.usePredictableInterfaceNames = lib.mkForce true; # so prefix matching works