diff --git a/doc/configuration.xml b/doc/configuration.xml index caff1e510cd..12e3b8ae851 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -2,12 +2,12 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-packageconfig"> -<filename>~/.nixpkgs/config.nix</filename>: global configuration +Global configuration Nix packages can be configured to allow or deny certain options. To apply the configuration edit -~/.nixpkgs/config.nix and set it like +~/.config/nixpkgs/config.nix and set it like { @@ -89,7 +89,7 @@ packages via packageOverrides You can define a function called packageOverrides in your local -~/.nixpkgs/config.nix to overide nix packages. It +~/.config/nixpkgs/config.nix to overide nix packages. It must be a function that takes pkgs as an argument and return modified set of packages. diff --git a/doc/functions.xml b/doc/functions.xml index 6374c15ddf2..5c654ffb956 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -119,7 +119,7 @@ evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in - ~/.nixpkgs/config.nix. + ~/.config/nixpkgs/config.nix. diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 6728f4abba0..f16077cced4 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -195,7 +195,7 @@ its normal core packages: mtl-2.2.1 This function allows users to define their own development environment by means -of an override. After adding the following snippet to `~/.nixpkgs/config.nix`, +of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`, { packageOverrides = super: let self = super.pkgs; in @@ -522,7 +522,7 @@ file with `cabal2nix`: $ cd ~/src/foo && cabal2nix . >default.nix $ cd ~/src/bar && cabal2nix . >default.nix -Then edit your `~/.nixpkgs/config.nix` file to register those builds in the +Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the default Haskell package set: { @@ -554,7 +554,7 @@ Every Haskell package set takes a function called `overrides` that you can use to manipulate the package as much as you please. One useful application of this feature is to replace the default `mkDerivation` function with one that enables library profiling for all packages. To accomplish that, add configure the -following snippet in your `~/.nixpkgs/config.nix` file: +following snippet in your `~/.config/nixpkgs/config.nix` file: { packageOverrides = super: let self = super.pkgs; in @@ -583,7 +583,7 @@ The first step is to generate Nix build instructions with `cabal2nix`: $ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix -Then add the override in `~/.nixpkgs/config.nix`: +Then add the override in `~/.config/nixpkgs/config.nix`: { packageOverrides = super: let self = super.pkgs; in diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0ba7ec4c44d..0f148f5c898 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -278,7 +278,7 @@ packageOverrides = pkgs: { to your Nixpkgs configuration - (~/.nixpkgs/config.nix) and install it by + (~/.config/nixpkgs/config.nix) and install it by running nix-env -f '<nixpkgs>' -iA myEclipse and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation diff --git a/lib/customisation.nix b/lib/customisation.nix index 3e6e279824b..41fe07fbd0a 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -15,10 +15,10 @@ rec { the original derivation attributes. `overrideDerivation' allows certain "ad-hoc" customisation - scenarios (e.g. in ~/.nixpkgs/config.nix). For instance, if you - want to "patch" the derivation returned by a package function in - Nixpkgs to build another version than what the function itself - provides, you can do something like this: + scenarios (e.g. in ~/.config/nixpkgs/config.nix). For instance, + if you want to "patch" the derivation returned by a package + function in Nixpkgs to build another version than what the + function itself provides, you can do something like this: mySed = overrideDerivation pkgs.gnused (oldAttrs: { name = "sed-4.2.2-pre"; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index e03f6046de8..89f09ed0844 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -316,10 +316,10 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides If you are not on NixOS or want to install this particular Emacs only for yourself, you can do so by adding it to your - ~/.nixpkgs/config.nix + ~/.config/nixpkgs/config.nix (see Nixpkgs manual): - Custom Emacs in <filename>~/.nixpkgs/system.nix</filename> + Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename> then else "") ""; - dirHome = homeDir + "/.nixpkgs/overlays"; + dirHome = homeDir + "/.config/nixpkgs/overlays"; dirCheck = dir: dir != "" && pathExists (dir + "/."); overlays = dir: let content = readDir dir; in