Remove extra arguments comming from config.*.

svn path=/nixos/branches/fix-style/; revision=13381

boot/boot-stage-1.nix

@@ -4,7 +4,12 @@
 # calls the init in the root file system to start the second boot
 # stage.
 
-{ pkgs, config, kernelPackages, modulesTree }:
+{pkgs, config}:
+
+let
+  kernelPackages = config.boot.kernelPackages;
+  modulesTree = config.system.modulesTree;
+in
 
 rec {
 

etc/default.nix

@@ -1,8 +1,12 @@
 { config, pkgs, systemPath, wrapperDir
-, defaultShell, extraEtc, nixEnvVars, modulesTree, nssModulesPath
+, defaultShell
 }:
 
 let 
+  extraEtc = config.environment.etc;
+  nixEnvVars = config.nix.envVars;
+  modulesTree = config.system.modulesTree;
+  nssModulesPath = config.system.nssModules.path;
 
 
   optional = pkgs.lib.optional;

installer/default.nix

@@ -1,7 +1,9 @@
-{pkgs, config, nix}:
+{pkgs, config}:
 
 let
 
+  nix = config.environment.nix;
+
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
     isExecutable = true;

system/system.nix

@@ -41,7 +41,7 @@ rec {
 
   # The initial ramdisk.
   initialRamdiskStuff = import ../boot/boot-stage-1.nix {
-    inherit pkgs config kernelPackages modulesTree;
+    inherit pkgs config;
   };
 
   initialRamdisk = initialRamdiskStuff.initialRamdisk;
@@ -49,7 +49,7 @@ rec {
 
   # NixOS installation/updating tools.
   nixosTools = import ../installer {
-    inherit pkgs config nix;
+    inherit pkgs config;
   };
 
 
@@ -70,8 +70,7 @@ rec {
   # The static parts of /etc.
   etc = import ../etc/default.nix {
     inherit config pkgs systemPath wrapperDir
-      defaultShell nixEnvVars modulesTree nssModulesPath;
-    extraEtc = config.environment.etc;
+      defaultShell;
   };