From a06529b7adbfe39e06c10d0c539418d130f2fecc Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 2 Nov 2019 14:34:50 +0100
Subject: [PATCH] nixos: default `environment.homeBinInPath` to false

This is a more sane default since we do not magically (without opt-in)
pull in binaries from `~/bin`. That is not really an expected behavior
for many users. Users that still want that behavior can now just flip
that switch.
---
 nixos/doc/manual/release-notes/rl-2003.xml  | 7 +++++++
 nixos/modules/config/shells-environment.nix | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index 4980a99e6468..26311e434056 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -186,6 +186,13 @@
      The osquery module has been removed.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      Going forward, <literal>~/bin/<literal> in the users home directory will no longer be in <literal>PATH</literal> by default.
+      If you depend on this you should set the option <literal>environment.homeBinInPath</literal> to <literal>true</literal>.
+      The aforementioned option was added this release.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index b79e16cd7979..a0a20228a742 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -122,7 +122,7 @@ in
       description = ''
         Include ~/bin/ in $PATH.
       '';
-      default = true;
+      default = false;
       type = types.bool;
     };