style / organization

divnix · Mar 18, 2021 · 12cfb76 · 12cfb76
1 parent d8720d9
commit 12cfb76
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/devos/devosSystem.nix b/lib/devos/devosSystem.nix
@@ -6,34 +6,38 @@ lib.nixosSystem (args // {
     let
       moduleList = builtins.attrValues modules;
       modpath = "nixos/modules";
-      cd = "installer/cd-dvd/installation-cd-minimal-new-kernel.nix";
 
       hostConfig = (lib.nixosSystem (args // { modules = moduleList; })).config;
 
       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 = suites.allProfilesButCore;
 
+              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}
                 hostConfig.system.build.toplevel
               ];
+
               # 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