diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-02-01 16:03:42 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-02-01 16:07:55 +0100 |
| commit | 9d6a55aefd771f047d2aa3085c9a3f8a2f452333 (patch) | |
| tree | 5e249e50300763f8a3bf9c69745a5381f64f7011 /pkgs/top-level/impure.nix | |
| parent | 7dacca324d9e86fe7f7fad450ec833c746f21415 (diff) | |
| download | nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.gz nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.bz2 nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.lz nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.xz nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.tar.zst nixpkgs-9d6a55aefd771f047d2aa3085c9a3f8a2f452333.zip | |
~/.nixpkgs -> ~/.config/nixpkgs
The former is still respected as a fallback for config.nix for backwards compatibility (but not for overlays because they're a new feature).
Diffstat (limited to 'pkgs/top-level/impure.nix')
| -rw-r--r-- | pkgs/top-level/impure.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index d1a28b9b15e..63112034d29 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -17,13 +17,15 @@ in system ? builtins.currentSystem , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or - # $HOME/.nixpkgs/config.nix. + # $HOME/.config/nixpkgs/config.nix. config ? let configFile = getEnv "NIXPKGS_CONFIG"; - configFile2 = homeDir + "/.nixpkgs/config.nix"; + configFile2 = homeDir + "/.config/nixpkgs/config.nix"; + configFile3 = homeDir + "/.nixpkgs/config.nix"; # obsolete in if configFile != "" && pathExists configFile then import configFile else if homeDir != "" && pathExists configFile2 then import configFile2 + else if homeDir != "" && pathExists configFile3 then import configFile3 else {} , # Overlays are used to extend Nixpkgs collection with additional @@ -31,7 +33,7 @@ in # fix-point made by Nixpkgs. overlays ? let dirPath = try (if pathExists <nixpkgs-overlays> then <nixpkgs-overlays> else "") ""; - dirHome = homeDir + "/.nixpkgs/overlays"; + dirHome = homeDir + "/.config/nixpkgs/overlays"; dirCheck = dir: dir != "" && pathExists (dir + "/."); overlays = dir: let content = readDir dir; in |