* For consistency, use /etc/nix/nix.conf instead of /nix/etc/nix/nix.conf.

There is really no reason to have a configuration file outside of /etc,
  and it's consistent with what the Fedora/Debian packages for Nix use.

svn path=/nixos/trunk/; revision=30212

modules/services/misc/nix-daemon.nix

@@ -226,7 +226,7 @@ in
                 $extraOptions
                 END
               '';
-          target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh.
+          target = "nix/nix.conf";
         }
       ]
 
@@ -281,7 +281,7 @@ in
 
     nix.envVars =
       ''
-        export NIX_CONF_DIR=/nix/etc/nix
+        export NIX_CONF_DIR=/etc/nix
 
         # Enable the copy-from-other-stores substituter, which allows builds
         # to be sped up by copying build results from remote Nix stores.  To
@@ -306,8 +306,6 @@ in
     system.activationScripts.nix = stringAfter [ "etc" "users" ]
       ''
         # Set up Nix.
-        mkdir -p /nix/etc/nix
-        ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
         chown root.nixbld /nix/store
         chmod 1775 /nix/store
 

modules/services/scheduling/cron.nix

@@ -12,7 +12,7 @@ let
       SHELL=${pkgs.bash}/bin/bash
       PATH=${config.system.path}/bin:${config.system.path}/sbin
       MAILTO="${config.services.cron.mailto}"
-      NIX_CONF_DIR=/nix/etc/nix
+      NIX_CONF_DIR=/etc/nix
       ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';
 

modules/services/scheduling/fcron.nix

@@ -13,7 +13,7 @@ let
       SHELL=${pkgs.bash}/bin/bash
       PATH=${config.system.path}/bin:${config.system.path}/sbin
       MAILTO="${config.services.cron.mailto}"
-      NIX_CONF_DIR=/nix/etc/nix
+      NIX_CONF_DIR=/etc/nix
       ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
     '';