From b95ad632010bf1d135f7585c590f51f6c3dc2896 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 24 May 2020 18:08:49 +0200
Subject: [PATCH] Deprecate use of `builtins.getEnv`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This removes the use of the non-deterministic function
`builtins.getEnv` for state version ≥ 20.09.

PR #1269
---
 doc/release-notes/rl-2009.adoc | 26 +++++++++++++++++++++++++-
 home-manager/install.nix       | 19 ++++++++++++++++++-
 modules/home-environment.nix   | 22 +++++++++++++++++-----
 modules/misc/xdg.nix           | 10 +++++++++-
 4 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/doc/release-notes/rl-2009.adoc b/doc/release-notes/rl-2009.adoc
index 96dfce930..0562e046d 100644
--- a/doc/release-notes/rl-2009.adoc
+++ b/doc/release-notes/rl-2009.adoc
@@ -18,4 +18,28 @@ The state version in this release includes the changes below. These
 changes are only active if the `home.stateVersion` option is set to
 "20.09" or later.
 
-* Nothing has happened.
+* The options <<opt-home.homeDirectory>> and <<opt-home.username>> no
+longer have default values and must therefore be provided in your
+configuration. Previously their values would default to the content of
+the environment variables `HOME` and `USER`, respectively.
++
+--
+Further, the options <<opt-xdg.cacheHome>>, <<opt-xdg.configHome>>,
+and <<opt-xdg.dataHome>> will no longer be affected by the
+`XDG_CACHE_HOME`, `XDG_CONFIG_HOME`, and `XDG_DATA_HOME` environment
+variables. They now unconditionally default to
+
+- `"${config.home.homeDirectory}/.cache"`,
+- `"${config.home.homeDirectory}/.config"`, and
+- `"${config.home.homeDirectory}/.local/share"`.
+
+If you choose to switch to state version 20.09 then you must set these
+options if you use non-default XDG base directory paths.
+
+The initial configuration generated by
+
+[source,console]
+$ nix-shell '<home-manager>' -A install
+
+will automatically include these options, when necessary.
+--
diff --git a/home-manager/install.nix b/home-manager/install.nix
index 92de17bd6..87252730e 100644
--- a/home-manager/install.nix
+++ b/home-manager/install.nix
@@ -12,6 +12,18 @@ runCommand "home-manager-install" {
       echo
       echo "Creating initial Home Manager configuration..."
 
+      nl=$'\n'
+      xdgVars=""
+      if [[ -v XDG_CACHE_HOME && $XDG_CACHE_HOME != "$HOME/.cache" ]]; then
+        xdgVars="$xdgVars  xdg.cacheHome = \"$XDG_CACHE_HOME\";$nl"
+      fi
+      if [[ -v XDG_CONFIG_HOME && $XDG_CONFIG_HOME != "$HOME/.config" ]]; then
+        xdgVars="$xdgVars  xdg.configHome = \"$XDG_CONFIG_HOME\";$nl"
+      fi
+      if [[ -v XDG_DATA_HOME && $XDG_DATA_HOME != "$HOME/.local/share" ]]; then
+        xdgVars="$xdgVars  xdg.dataHome = \"$XDG_DATA_HOME\";$nl"
+      fi
+
       mkdir -p "$(dirname "$confFile")"
       cat > $confFile <<EOF
     { config, pkgs, ... }:
@@ -20,6 +32,11 @@ runCommand "home-manager-install" {
       # Let Home Manager install and manage itself.
       programs.home-manager.enable = true;
 
+      # Home Manager needs a bit of information about you and the
+      # paths it should manage.
+      home.username = "$USER";
+      home.homeDirectory = "$HOME";
+    $xdgVars
       # This value determines the Home Manager release that your
       # configuration is compatible with. This helps avoid breakage
       # when a new Home Manager release introduces backwards
@@ -28,7 +45,7 @@ runCommand "home-manager-install" {
       # You can update Home Manager without changing this value. See
       # the Home Manager release notes for a list of state version
       # changes in each release.
-      home.stateVersion = "20.03";
+      home.stateVersion = "20.09";
     }
     EOF
     fi
diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 66adab441..2f2b77d21 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -125,14 +125,22 @@ in
   options = {
     home.username = mkOption {
       type = types.str;
-      defaultText = "$USER";
+      defaultText = literalExample ''
+        "$USER"   for state version < 20.09,
+        undefined for state version ≥ 20.09
+      '';
+      example = "jane.doe";
       description = "The user's username.";
     };
 
     home.homeDirectory = mkOption {
       type = types.path;
-      defaultText = "$HOME";
-      description = "The user's home directory.";
+      defaultText = literalExample ''
+        "$HOME"   for state version < 20.09,
+        undefined for state version ≥ 20.09
+      '';
+      example = "/home/jane.doe";
+      description = "The user's home directory. Must be an absolute path.";
     };
 
     home.profileDirectory = mkOption {
@@ -327,8 +335,12 @@ in
       }
     ];
 
-    home.username = mkDefault (builtins.getEnv "USER");
-    home.homeDirectory = mkDefault (builtins.getEnv "HOME");
+    home.username =
+      mkIf (versionOlder config.home.stateVersion "20.09")
+        (mkDefault (builtins.getEnv "USER"));
+    home.homeDirectory =
+      mkIf (versionOlder config.home.stateVersion "20.09")
+        (mkDefault (builtins.getEnv "HOME"));
 
     home.profileDirectory =
       if config.submoduleSupport.enable
diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix
index 84ab4ada5..7420e8e92 100644
--- a/modules/misc/xdg.nix
+++ b/modules/misc/xdg.nix
@@ -85,12 +85,20 @@ in
       };
     })
 
-    (mkIf (!cfg.enable) {
+    # Legacy non-deterministic setup.
+    (mkIf (!cfg.enable && versionOlder config.home.stateVersion "20.09") {
       xdg.cacheHome = getXdgDir "XDG_CACHE_HOME" defaultCacheHome;
       xdg.configHome = getXdgDir "XDG_CONFIG_HOME" defaultConfigHome;
       xdg.dataHome = getXdgDir "XDG_DATA_HOME" defaultDataHome;
     })
 
+    # "Modern" deterministic setup.
+    (mkIf (!cfg.enable && versionAtLeast config.home.stateVersion "20.09") {
+      xdg.cacheHome = mkDefault defaultCacheHome;
+      xdg.configHome = mkDefault defaultConfigHome;
+      xdg.dataHome = mkDefault defaultDataHome;
+    })
+
     {
       home.file = mkMerge [
         cfg.configFile